Changes in tests/Makefile.am [dcfedca:d65f92c]

File:

• tests/Makefile.am (modified) (7 diffs)

tests/Makefile.am

@@ -22 +22 @@
 debug=yes
 installed=no
-archiveerrors=
 
 INSTALL_FLAGS=-in-tree
@@ -35 +34 @@
 
 # applies to both programs
+# since automake doesn't have support for CFA we have to
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
         -g \
@@ -42 +42 @@
         -DIN_DIR="${abs_srcdir}/.in/"
 
-AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
-CC = @CFACC@
+CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
+CFACCBIN = @CFACC@
+CFACC = $(CC)
 
 PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
@@ -57 +58 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -87 +88 @@
 
 # Use for all tests, make sure the path are correct and all flags are added
-CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
+CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) -c $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
 
-# Use for tests that either generate an executable, print directyl to stdout or the make command is expected to fail
+# Use for tests that either generate an executable, print directly to stdout or the make command is expected to fail
 CFATEST_STDOUT=$(CFACOMPILETEST) -o $(abspath ${@})
 
@@ -98 +99 @@
 
 # implicit rule so not all test require a rule
-% : %.cfa $(CFACC)
-        $(CFATEST_STDOUT)
+% : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -o $(abspath ${@}).o
+        $(CFACC) $(abspath ${@}).o -o $(abspath ${@})
+
 
 % : %.cpp
@@ -123 +126 @@
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
-typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
+typedefRedef-ERR1: typedefRedef.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
-alloc-ERROR: alloc.cfa $(CFACC)
+alloc-ERROR: alloc.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
-nested-types-ERR1: nested-types.cfa $(CFACC)
+nested-types-ERR1: nested-types.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
-nested-types-ERR2: nested-types.cfa $(CFACC)
+nested-types-ERR2: nested-types.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR2
 
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR2
 
-raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
+raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
-raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
+raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACCBIN)
         $(CFATEST_STDOUT) -DERR1
 
 #builtins
-builtins/sync: builtins/sync.cfa $(CFACC)
+builtins/sync: builtins/sync.cfa $(CFACCBIN)
         $(CFATEST_STDERR) -fsyntax-only
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
+warnings/self-assignment: warnings/self-assignment.cfa $(CFACCBIN)
         $(CFATEST_STDERR) -fsyntax-only