Changes in tests/Makefile.am [e16797c:107b01a]

File:

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

tests/Makefile.am

@@ -28 +28 @@
 timeouts=
 
-TEST_PY = python3 ${builddir}/test.py
+TEST_PY = python ${builddir}/test.py
 
 # applies to both programs
@@ -36 +36 @@
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -DIN_DIR="${abs_srcdir}/.in/"
+        -DIN_DIR="${srcdir}/.in/"
 
 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
 CC = @CFACC@
 
-PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
+PRETTY_PATH=cd ${srcdir} &&
 
 .PHONY: list .validate
@@ -48 +48 @@
 
 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
-# automake doesn't know we still need C/CPP rules so pretend like we have a C program
-_dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
+# automake doesn't know we still need C rules so pretend like we have a C program
+_dummy_hack_SOURCES = .dummy_hack.c
 
 #----------------------------------------------------------------------------------------------------------------
@@ -74 +74 @@
         @echo "int main() { return 0; }" > ${@}
 
-.dummy_hackxx.cpp:
-        @echo "int bar() { return 0; }" > ${@}
-
 concurrency :
         @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
@@ -82 +79 @@
 #----------------------------------------------------------------------------------------------------------------
 
-# 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 ${@})
-
-#----------------------------------------------------------------------------------------------------------------
-
 # implicit rule so not all test require a rule
 % : %.cfa $(CFACC)
-        $(CFATEST_STDOUT)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-% : %.cpp
-        $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-#------------------------------------------------------------------------------
-# TARGET WITH STANDARD RULE BUT 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
+gccExtensions : gccExtensions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-#------------------------------------------------------------------------------
-# Expected failures
-completeTypeError_FLAGS= -DERR1
+extension : extension.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-#------------------------------------------------------------------------------
-# CUSTOM TARGET
-#------------------------------------------------------------------------------
-typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+attributes : attributes.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-alloc-ERROR: alloc.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+functions: functions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-nested-types-ERR1: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR1
+KRfunctions : KRfunctions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-nested-types-ERR2: nested-types.cfa $(CFACC)
-        $(CFATEST_STDOUT) -DERR2
+sched-ext-parse : sched-ext-parse.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
-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
+gmp : gmp.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 #builtins
 builtins/sync: builtins/sync.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+
+#------------------------------------------------------------------------------
+
+#To make errors path independent we need to cd into the correct directories
+completeTypeError : completeTypeError.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+alloc-ERROR: alloc.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+fallthrough-ERROR: fallthrough.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+nested-types-ERR1: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+nested-types-ERR2: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+# Constructor/destructor tests
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 # Warnings
 warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
-        $(CFATEST_STDERR) -fsyntax-only
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only