Ignore:
Timestamp:
Mar 28, 2019, 11:49:44 AM (3 years ago)
Author:
tdelisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
ea62265
Parents:
1241851
Message:

Fixing longrun_tests to compile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • longrun_tests/Makefile.am

    r1241851 re8fe5e0  
    1818ACLOCAL_AMFLAGS  = -I automake
    1919
     20include $(top_srcdir)/src/cfa.make
     21
    2022repeats=10
    2123max_time=600
     
    2426type=LONG
    2527
    26 REPEAT = ${abs_top_srcdir}/tools/repeat
    27 WATCHDOG = ${abs_top_srcdir}/tools/watchdog
     28REPEAT = $(abs_top_builddir)/tools/repeat
     29WATCHDOG = $(abs_top_builddir)/tools/watchdog
    2830TIME = /usr/bin/time -f "%E"
    2931
    30 # $(shell ./update-type $(type))
    31 # ./update-type $(type)
     32UPDATED_TYPE = $(shell $(srcdir)/update-type $(type))
    3233
    33 UPDATED_TYPE = $(shell ./update-type $(type))
    34 
    35 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)
    36 CFLAGS = ${BUILD_FLAGS}
    37 CC = @CFACC@
     34BUILD_FLAGS =
     35AM_CFAFLAGS = \
     36        -g \
     37        -Wall \
     38        -Wno-unused-function \
     39        -quiet \
     40        -O2 \
     41        -DPREEMPTION_RATE=$(preempt) \
     42        -I$(abs_top_srcdir)/tests \
     43        -I$(srcdir) \
     44        -DTEST_$(shell cat .type | tr a-z A-Z) \
     45        -in-tree
    3846
    3947TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
    4048
    41 # .INTERMEDIATE: ${TESTS}
     49# .INTERMEDIATE: $(TESTS)
    4250
    43 all-local: ${TESTS:=.run}
     51all-local: $(TESTS:=.run)
    4452
    45 runall : ${TESTS:=.run}
     53runall : $(TESTS:=.run)
    4654        @ echo "All programs terminated normally"
    4755
    48 watchall : ${TESTS:=.watch}
     56watchall : $(TESTS:=.watch)
    4957        @ echo "All programs terminated normally"
    5058
    51 compileall : ${TESTS}
     59compileall : $(TESTS)
    5260        @ echo "Compiled"
    5361
    5462clean-local:
    55         rm -f ${TESTS} core* out.log .type
     63        rm -f $(TESTS) core* out.log .type
    5664
    57 % : %.c ${CC} ${UPDATED_TYPE}
    58         ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
     65% : %.cfa $(CFACC) $(UPDATED_TYPE)
     66        $(AM_V_CFA)$(CFACOMPILE) $(<) $(debug) -o $(@)
    5967
    60 %.run : % ${REPEAT}
    61         @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    62         @ rm ${<}
    63         @ echo -e "${<}: SUCCESS\n"
     68%.run : % $(REPEAT)
     69        @ time $(REPEAT) -r out.log -i -s $(repeats) timeout $(max_time) ./$(<)
     70        @ rm $(<)
     71        @ echo -e "$(<): SUCCESS\n"
    6472
    65 %.watch : % ${WATCHDOG}
    66         @ time ${WATCHDOG} ./${<}
    67         @ rm ${<}
    68         @ echo -e "${<}: SUCCESS\n"
     73%.watch : % $(WATCHDOG)
     74        @ time $(WATCHDOG} ./$(<)
     75        @ rm $(<)
     76        @ echo -e "$(<): SUCCESS\n"
    6977
    70 %.time : % ${REPEAT}
    71         @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
    72         @ rm ${<}
    73         @ echo -e "${<}: SUCCESS\n"
     78%.time : % $(REPEAT)
     79        @ $(REPEAT) -i -s -- $(repeats) $(TIME) -a -o times.log ./$(<)
     80        @ rm $(<)
     81        @ echo -e "$(<): SUCCESS\n"
    7482
    75 ${REPEAT}: ${abs_top_srcdir}/tools/Makefile
    76         @+make -C ${abs_top_srcdir}/tools/
     83$(REPEAT): $(abs_top_builddir)/tools/Makefile
     84        @+make -C $(abs_top_builddir)/tools/
    7785
    78 ${WATCHDOG}: ${abs_top_srcdir}/tools/Makefile
    79         @+make -C ${abs_top_srcdir}/tools/
     86$(WATCHDOG): $(abs_top_builddir)/tools/Makefile
     87        @+make -C $(abs_top_builddir)/tools/
Note: See TracChangeset for help on using the changeset viewer.