Changeset 7009b9b

Timestamp:

Sep 12, 2019, 3:56:27 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

15f9c8e

Parents:

31d8f4d

Message:

Fixed compilation of tests that don't produce an executable

Location:

tests

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)

tests/Makefile.am

@@ -89 +89 @@
 
 # Use for all tests, make sure the path are correct and all flags are added
-CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) -c $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
+CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
 
 # Use for tests that either generate an executable, print directly to stdout or the make command is expected to fail
@@ -99 +99 @@
 #----------------------------------------------------------------------------------------------------------------
 
+is_ascii = $(shell file )
+
 # implicit rule so not all test require a rule
 % : %.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -o $(abspath ${@}).o
+        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
         $(CFACC) $(abspath ${@}).o -o $(abspath ${@})
 
+# @ if [[ "$(shell file $(abspath ${@}).o)" == *"ASCII text"* ]]; then echo "mv $(abspath ${@}).o $(abspath ${@})"; mv $(abspath ${@}).o $(abspath ${@}); else echo "$(CFACC) $(abspath ${@}).o -o $(abspath ${@});"; $(CFACC) $(abspath ${@}).o -o $(abspath ${@}); fi
+
+declarationSpecifier gccExtensions extension attributes functions KRfunctions : % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -CFA -XCFA -p -o $(abspath ${@}).o
+        mv $(abspath ${@}).o $(abspath ${@})
 
 % : %.cpp

tests/Makefile.in

@@ -404 +404 @@
 
 # Use for all tests, make sure the path are correct and all flags are added
-CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) -c $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
+CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
 
 # Use for tests that either generate an executable, print directly to stdout or the make command is expected to fail
@@ -411 +411 @@
 # Use for tests where the make command is expecte to succeed but the expected.txt should be compared to stderr
 CFATEST_STDERR = $(CFACOMPILETEST) 2> $(abspath ${@})
+
+#----------------------------------------------------------------------------------------------------------------
+is_ascii = $(shell file )
 
 #------------------------------------------------------------------------------
@@ -805 +808 @@
         @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
 
-#----------------------------------------------------------------------------------------------------------------
-
 # implicit rule so not all test require a rule
 % : %.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -o $(abspath ${@}).o
+        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
         $(CFACC) $(abspath ${@}).o -o $(abspath ${@})
+
+# @ if [[ "$(shell file $(abspath ${@}).o)" == *"ASCII text"* ]]; then echo "mv $(abspath ${@}).o $(abspath ${@})"; mv $(abspath ${@}).o $(abspath ${@}); else echo "$(CFACC) $(abspath ${@}).o -o $(abspath ${@});"; $(CFACC) $(abspath ${@}).o -o $(abspath ${@}); fi
+
+declarationSpecifier gccExtensions extension attributes functions KRfunctions : % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -CFA -XCFA -p -o $(abspath ${@}).o
+        mv $(abspath ${@}).o $(abspath ${@})
 
 % : %.cpp