Changeset d35e796 for src

Timestamp:

Jun 14, 2018, 11:00:30 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

ef952d7

Parents:

934d200

Message:

Fixed depencies of long tests based on type

Location:

src/tests

Files:

• .gitignore (modified) (1 diff)
• preempt_longrun/Makefile.am (modified) (2 diffs)
• preempt_longrun/Makefile.in (modified) (2 diffs)
• preempt_longrun/update-type (added)

src/tests/.gitignore

@@ -1 +1 @@
 .out/
 .err/
+.type

src/tests/preempt_longrun/Makefile.am

@@ -25 +25 @@
 TIME = /usr/bin/time -f "%E"
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell echo $(type) | tr a-z A-Z)
+# $(shell ./update-type $(type))
+# ./update-type $(type)
+
+UPDATED_TYPE = $(shell ./update-type $(type))
+
+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@
@@ -45 +50 @@
 
 clean-local:
-        rm -f ${TESTS} core* out.log
+        rm -f ${TESTS} core* out.log .type
 
-% : %.c ${CC}
+% : %.c ${CC} ${UPDATED_TYPE}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 

src/tests/preempt_longrun/Makefile.in

@@ -456 +456 @@
 WATCHDOG = ${abs_top_srcdir}/tools/watchdog
 TIME = /usr/bin/time -f "%E"
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell echo $(type) | tr a-z A-Z)
+
+# $(shell ./update-type $(type))
+# ./update-type $(type)
+UPDATED_TYPE = $(shell ./update-type $(type))
+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)
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 all: all-am
@@ -889 +893 @@
 
 clean-local:
-        rm -f ${TESTS} core* out.log
-
-% : %.c ${CC}
+        rm -f ${TESTS} core* out.log .type
+
+% : %.c ${CC} ${UPDATED_TYPE}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}