Changes in tests/Makefile.am [b90aace:bdff89d]

File:

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

tests/Makefile.am

@@ -23 +23 @@
 
 concurrent=
-timeouts=
 
 TEST_PY = python ${builddir}/test.py
@@ -39 +38 @@
 CC = @CFACC@
 
-PRETTY_PATH=cd ${srcdir} &&
-
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.c
@@ -51 +48 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -74 +71 @@
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) $(abspath ${<}) -o ${@}
 
 declarationSpecifier: declarationSpecifier.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 gccExtensions : gccExtensions.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 extension : extension.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 attributes : attributes.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 functions: functions.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 KRfunctions : KRfunctions.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 sched-ext-parse : sched-ext-parse.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 gmp : gmp.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
+
+completeTypeError : completeTypeError.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+typedefRedef-ERR1: typedefRedef.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+alloc-ERROR: alloc.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+fallthrough-ERROR: fallthrough.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR1: nested-types.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR2: nested-types.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
+
+# Constructor/destructor tests
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
+
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+# Warnings
+warnings/self-assignment: warnings/self-assignment.c $(CC)
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
 builtins/sync: builtins/sync.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
-
-#------------------------------------------------------------------------------
-#To make errors path independent we need to cd into the correct directories
-completeTypeError : completeTypeError.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-typedefRedef-ERR1: typedefRedef.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-alloc-ERROR: alloc.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-fallthrough-ERROR: fallthrough.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-nested-types-ERR1: nested-types.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-nested-types-ERR2: nested-types.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-# Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
-
-# Warnings
-warnings/self-assignment: warnings/self-assignment.c $(CC)
-        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only