Changeset e8fe5e0 for longrun_tests/Makefile.am

Timestamp:

Mar 28, 2019, 11:49:44 AM (4 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

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

Children:

ea62265

Parents:

1241851

Message:

Fixing longrun_tests to compile

File:

• longrun_tests/Makefile.am (modified) (2 diffs)

longrun_tests/Makefile.am

@@ -18 +18 @@
 ACLOCAL_AMFLAGS  = -I automake
 
+include $(top_srcdir)/src/cfa.make
+
 repeats=10
 max_time=600
@@ -24 +26 @@
 type=LONG
 
-REPEAT = ${abs_top_srcdir}/tools/repeat
-WATCHDOG = ${abs_top_srcdir}/tools/watchdog
+REPEAT = $(abs_top_builddir)/tools/repeat
+WATCHDOG = $(abs_top_builddir)/tools/watchdog
 TIME = /usr/bin/time -f "%E"
 
-# $(shell ./update-type $(type))
-# ./update-type $(type)
+UPDATED_TYPE = $(shell $(srcdir)/update-type $(type))
 
-UPDATED_TYPE = $(shell ./update-type $(type))
-
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I../tests -I. -DTEST_$(shell cat .type | tr a-z A-Z)
-CFLAGS = ${BUILD_FLAGS}
-CC = @CFACC@
+BUILD_FLAGS =
+AM_CFAFLAGS = \
+        -g \
+        -Wall \
+        -Wno-unused-function \
+        -quiet \
+        -O2 \
+        -DPREEMPTION_RATE=$(preempt) \
+        -I$(abs_top_srcdir)/tests \
+        -I$(srcdir) \
+        -DTEST_$(shell cat .type | tr a-z A-Z) \
+        -in-tree
 
 TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 
-# .INTERMEDIATE: ${TESTS}
+# .INTERMEDIATE: $(TESTS)
 
-all-local: ${TESTS:=.run}
+all-local: $(TESTS:=.run)
 
-runall : ${TESTS:=.run}
+runall : $(TESTS:=.run)
         @ echo "All programs terminated normally"
 
-watchall : ${TESTS:=.watch}
+watchall : $(TESTS:=.watch)
         @ echo "All programs terminated normally"
 
-compileall : ${TESTS}
+compileall : $(TESTS)
         @ echo "Compiled"
 
 clean-local:
-        rm -f ${TESTS} core* out.log .type
+        rm -f $(TESTS) core* out.log .type
 
-% : %.c ${CC} ${UPDATED_TYPE}
-        ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
+% : %.cfa $(CFACC) $(UPDATED_TYPE)
+        $(AM_V_CFA)$(CFACOMPILE) $(<) $(debug) -o $(@)
 
-%.run : % ${REPEAT}
-        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
-        @ rm ${<}
-        @ echo -e "${<}: SUCCESS\n"
+%.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"
+%.watch : % $(WATCHDOG)
+        @ time $(WATCHDOG} ./$(<)
+        @ rm $(<)
+        @ echo -e "$(<): SUCCESS\n"
 
-%.time : % ${REPEAT}
-        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
-        @ rm ${<}
-        @ echo -e "${<}: SUCCESS\n"
+%.time : % $(REPEAT)
+        @ $(REPEAT) -i -s -- $(repeats) $(TIME) -a -o times.log ./$(<)
+        @ rm $(<)
+        @ echo -e "$(<): SUCCESS\n"
 
-${REPEAT}: ${abs_top_srcdir}/tools/Makefile
-        @+make -C ${abs_top_srcdir}/tools/
+$(REPEAT): $(abs_top_builddir)/tools/Makefile
+        @+make -C $(abs_top_builddir)/tools/
 
-${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
-        @+make -C ${abs_top_srcdir}/tools/
+$(WATCHDOG): $(abs_top_builddir)/tools/Makefile
+        @+make -C $(abs_top_builddir)/tools/