Changes in tests/Makefile.in [655c5fa:34e1494]

File:

• tests/Makefile.in (modified) (6 diffs)

tests/Makefile.in

@@ -212 +212 @@
 AWK = @AWK@
 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
-CC = @CFACC@
+
+# adjust CC to current flags
+CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
-CFACC = @CFACC@
+CFACC = $(CC)
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
@@ -248 +250 @@
 FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
 HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
@@ -386 +389 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
-        -quiet @CFA_FLAGS@ -DIN_DIR="${abs_srcdir}/.in/" \
-        ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
+# since automake doesn't have support for CFA we have to
+AM_CFLAGS = $(if $(test), 2> $(test), ) \
+        -g \
+        -Wall \
+        -Wno-unused-function \
+        -quiet @CFA_FLAGS@ \
+        -DIN_DIR="${abs_srcdir}/.in/"
+
+
+# get local binary for depedencies
+CFACCBIN = @CFACC@
+
+# adjusted CC but without the actual distcc call
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
 PRETTY_PATH = mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
 avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
@@ -397 +411 @@
 
 # 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'))
-
-# Use for tests that either generate an executable, print directyl to stdout or the make command is expected to fail
-CFATEST_STDOUT = $(CFACOMPILETEST) -o $(abspath ${@})
-
-# 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 ${@})
+CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGSCFA" | sed 's/-\|\//_/g'))
 
 #------------------------------------------------------------------------------
-# TARGET WITH STANDARD RULE BUT CUSTOM FLAGS
+# TARGETS WITH CUSTOM FLAGS
 #------------------------------------------------------------------------------
-# Expected failures
-declarationSpecifier_FLAGS = -CFA -XCFA -p
-gccExtensions_FLAGS = -CFA -XCFA -p
-extension_FLAGS = -CFA -XCFA -p
-attributes_FLAGS = -CFA -XCFA -p
-functions_FLAGS = -CFA -XCFA -p
-KRfunctions_FLAGS = -CFA -XCFA -p
-gmp_FLAGS = -lgmp
+# custom libs
+gmp_FLAGSLD = -lgmp
 
 #------------------------------------------------------------------------------
-# Expected failures
-completeTypeError_FLAGS = -DERR1
+# Generated code
+GENERATED_CODE = declarationSpecifier gccExtensions extension attributes functions KRfunctions
+
+# Use for tests where the make command is expected to succeed but the expected.txt should be compared to stderr
+EXPECT_STDERR = builtins/sync warnings/self-assignment
 all: all-am
 
@@ -771 +776 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${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} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -801 +806 @@
 
 # implicit rule so not all test require a rule
-% : %.cfa $(CFACC)
-        $(CFATEST_STDOUT)
-
+# split into two steps to support compiling remotely using distcc
+# don't use distcc to do the linking because distcc doesn't do linking
+% : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
+        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+
+# implicit rule for c++ test
+# convient for testing the testsuite itself but not actuall used
 % : %.cpp
         $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+$(GENERATED_CODE): % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -CFA -XCFA -p -c -fsyntax-only -o $(abspath ${@})
+$(EXPECT_STDERR): % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only 2> $(abspath ${@})
 
 #------------------------------------------------------------------------------
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
-typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-alloc-ERROR: alloc.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-nested-types-ERR1: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-nested-types-ERR2: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR2
-
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR2
-
-raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
-
-#builtins
-builtins/sync: builtins/sync.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
-
-# Warnings
-warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
+# expected failures
+# use custom target since they require a custom define and custom dependencies
+alloc-ERROR : alloc.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+typedefRedef-ERR1 : typedefRedef.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+nested-types-ERR1 : nested-types.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+nested-types-ERR2 : nested-types.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
+
+raii/memberCtors-ERR1 : raii/memberCtors.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
+
+raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
+
+#------------------------------------------------------------------------------
+# Other targets
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.