Changeset f7d3215 for tests/Makefile.in

Timestamp:

Aug 20, 2018, 2:29:35 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

72b3605

Parents:

69efc321

Message:

Hopefully more robust fix for relative vs absolutepaths in tests

File:

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

tests/Makefile.in

@@ -307 +307 @@
         -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_FLAGS} \
         ${INSTALL_FLAGS} ${ARCH_FLAGS}
+PRETTY_PATH = cd ${srcdir} &&
 fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
@@ -638 +639 @@
 # 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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.