Changes in src/tests/preempt_longrun/Makefile.am [d35e796:b9da9585]

File:

• src/tests/preempt_longrun/Makefile.am (modified) (3 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"
 
-# $(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)
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -DLONG_TEST
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
@@ -36 +29 @@
 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"
+clean-local:
+        rm -f ${TESTS}
 
-watchall : ${TESTS:=.watch}
-        @ echo "All programs terminated normally"
-
-compileall : ${TESTS}
-        @ echo "Compiled"
-
-clean-local:
-        rm -f ${TESTS} core* out.log .type
-
-% : %.c ${CC} ${UPDATED_TYPE}
+% : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 
 %.run : % ${REPEAT}
         @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
-        @ rm ${<}
-        @ echo -e "${<}: SUCCESS\n"
-
-%.watch : % ${WATCHDOG}
-        @ time ${WATCHDOG} ./${<}
         @ rm ${<}
         @ echo -e "${<}: SUCCESS\n"
@@ -70 +49 @@
         @ echo -e "${<}: SUCCESS\n"
 
-${REPEAT}: ${abs_top_srcdir}/tools/Makefile
+${REPEAT}:
         @+make -C ${abs_top_srcdir}/tools/
-
-${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
-        @+make -C ${abs_top_srcdir}/tools/