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

File:

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

tests/Makefile.am

@@ -23 +23 @@
 
 concurrent=
+timeouts=
 
 TEST_PY = python ${builddir}/test.py
@@ -38 +39 @@
 CC = @CFACC@
 
+PRETTY_PATH=cd ${srcdir} &&
+
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.c
@@ -48 +51 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => 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 :
@@ -71 +74 @@
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        $(COMPILE) $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 declarationSpecifier: declarationSpecifier.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 gccExtensions : gccExtensions.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 extension : extension.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 attributes : attributes.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 functions: functions.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 KRfunctions : KRfunctions.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 sched-ext-parse : sched-ext-parse.c $(CC)
-        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 gmp : gmp.c $(CC)
-        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
+#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)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 typedefRedef-ERR1: typedefRedef.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 alloc-ERROR: alloc.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 fallthrough-ERROR: fallthrough.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 nested-types-ERR1: nested-types.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 nested-types-ERR2: nested-types.c $(CC)
-        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
+        $(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)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
-        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
-        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c $(CC)
-        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
-
-#builtins
-builtins/sync: builtins/sync.c $(CC)
-        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only