Changeset 3d5701e for tests/Makefile.am

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

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

tests/Makefile.am

@@ -24 +24 @@
 archiveerrors=
 
-INSTALL_FLAGS=-in-tree
 DEBUG_FLAGS=-debug -O0
 
@@ -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@
+# get the desired cfa to test
+TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
+
+# adjust CC to current flags
+CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
+CFACC = $(CC)
+
+# get local binary for depedencies
+CFACCBIN = @CFACC@
+
+# adjusted CC but without the actual distcc call
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 
 PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
@@ -57 +67 @@
 #----------------------------------------------------------------------------------------------------------------
 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 :
@@ -87 +97 @@
 
 # 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'))
 
 #----------------------------------------------------------------------------------------------------------------
 
 # 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 ${@})
 
 #------------------------------------------------------------------------------
-# 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
+$(GENERATED_CODE): % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -CFA -XCFA -p -c -fsyntax-only -o $(abspath ${@})
+
+# 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
+$(EXPECT_STDERR): % : %.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only 2> $(abspath ${@})
 
 #------------------------------------------------------------------------------
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
-typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+# 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 ${@})
 
-alloc-ERROR: alloc.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+typedefRedef-ERR1 : typedefRedef.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
-nested-types-ERR1: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+nested-types-ERR1 : nested-types.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
-nested-types-ERR2: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR2
+nested-types-ERR2 : nested-types.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+raii/memberCtors-ERR1 : raii/memberCtors.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR2
+raii/ctor-autogen-ERR1 : raii/ctor-autogen.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
-raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+raii/dtor-early-exit-ERR1 : raii/dtor-early-exit.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR1 -c -fsyntax-only -o $(abspath ${@})
 
-raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+raii/dtor-early-exit-ERR2 : raii/dtor-early-exit.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
-#builtins
-builtins/sync: builtins/sync.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
-
-# Warnings
-warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
+#------------------------------------------------------------------------------
+# Other targets