Changes in src/tests/preempt_longrun/Makefile.am [41770ed1:7bdcac1]

File:

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

src/tests/preempt_longrun/Makefile.am

@@ -19 +19 @@
 preempt=10ul\`ms
 debug=-debug
+type=LONG
 
 REPEAT = ${abs_top_srcdir}/tools/repeat
+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} -DLONG_TEST
+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)
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
@@ -29 +31 @@
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 
-.INTERMEDIATE: ${TESTS}
+# .INTERMEDIATE: ${TESTS}
 
 all-local: ${TESTS:=.run}
 
+runall : ${TESTS:=.run}
+        @ echo "All programs terminated normally"
+
+watchall : ${TESTS:=.watch}
+        @ echo "All programs terminated normally"
+
+compileall : ${TESTS}
+        @ echo "Compiled"
+
 clean-local:
-        rm -f ${TESTS} core* out.log
+        rm -f ${TESTS}
 
 % : %.c ${CC}
@@ -44 +55 @@
         @ echo -e "${<}: SUCCESS\n"
 
+%.watch : % ${WATCHDOG}
+        @ time ${WATCHDOG} ./${<}
+        @ rm ${<}
+        @ echo -e "${<}: SUCCESS\n"
+
 %.time : % ${REPEAT}
         @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
@@ -49 +65 @@
         @ echo -e "${<}: SUCCESS\n"
 
-${REPEAT}:
+${REPEAT}: ${abs_top_srcdir}/tools/Makefile
         @+make -C ${abs_top_srcdir}/tools/
+
+${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
+        @+make -C ${abs_top_srcdir}/tools/