Changeset 95b1e28 for src/tests

Timestamp:

Jul 31, 2018, 8:35:42 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

5d4fa18

Parents:

4137e31 (diff), a4248de1 (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:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• preempt_longrun/Makefile.am (modified) (1 diff)
• preempt_longrun/Makefile.in (modified) (1 diff)

src/tests/Makefile.am

@@ -79 +79 @@
         @+${TEST_PY} --debug=${debug} -Iconcurrent
 
+# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
+# however, here it is more complicated because it must match the dependencies based on how
+# they are generated by gcc
+headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
+$(headers_deps) :
+        echo "Dummy rule, should never be called"
+
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
+
+# implicit rule so not all test require a rule
 % : %.c $(CC)
+        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/Makefile.in

@@ -309 +309 @@
 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
+
+# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
+# however, here it is more complicated because it must match the dependencies exactly
+# depencies seem to have the absolute path to the build directory and relative path
+# to the headers from there
+headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
 all: all-am
 
@@ -626 +634 @@
 concurrency :
         @+${TEST_PY} --debug=${debug} -Iconcurrent
-
+$(headers_deps) :
+        echo "Dummy rule, should never be called"
+
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
+
+# implicit rule so not all test require a rule
 % : %.c $(CC)
+        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/preempt_longrun/Makefile.am

@@ -32 +32 @@
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
 CFLAGS = ${BUILD_FLAGS}
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${top_builddir}/src/driver/cfa
 
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

src/tests/preempt_longrun/Makefile.in

@@ -337 +337 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${top_builddir}/src/driver/cfa
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@