Ignore:
Timestamp:
Jan 31, 2018, 5:50:34 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
295e5071
Parents:
bc6f918 (diff), 281806b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/preempt_longrun/Makefile.in

    rbc6f918 re2e7330  
    451451max_time = 600
    452452preempt = 1_000ul
    453 REPEAT = ${abs_top_srcdir}/tools/repeat -s
     453REPEAT = ${abs_top_srcdir}/tools/repeat
     454TIME = /usr/bin/time -f "%E"
    454455BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
    455456TESTS = block create disjoint enter enter3 processor stack wait yield
     
    874875        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
    875876
    876 %.run : %
    877         @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
     877%.run : % ${REPEAT}
     878        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    878879        @ rm ${<}
    879880        @ echo -e "${<}: SUCCESS\n"
     881
     882%.time : % ${REPEAT}
     883        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
     884        @ rm ${<}
     885        @ echo -e "${<}: SUCCESS\n"
     886
     887${REPEAT}:
     888        @+make -C ${abs_top_srcdir}/tools/
    880889
    881890# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.