Changeset 281806b for src/tests/preempt_longrun/Makefile.in

Timestamp:

Jan 31, 2018, 5:49:46 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

23c27039, cc344be, e2e7330

Parents:

5ff188f (diff), 4ab3d68e (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 plg2:software/cfa/cfa-cc

File:

• src/tests/preempt_longrun/Makefile.in (modified) (2 diffs)

src/tests/preempt_longrun/Makefile.in

@@ -451 +451 @@
 max_time = 600
 preempt = 1_000ul
-REPEAT = ${abs_top_srcdir}/tools/repeat -s
+REPEAT = ${abs_top_srcdir}/tools/repeat
+TIME = /usr/bin/time -f "%E"
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = block create disjoint enter enter3 processor stack wait yield
@@ -874 +875 @@
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
 
-%.run : %
-        @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
+%.run : % ${REPEAT}
+        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
         @ rm ${<}
         @ echo -e "${<}: SUCCESS\n"
+
+%.time : % ${REPEAT}
+        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
+        @ rm ${<}
+        @ echo -e "${<}: SUCCESS\n"
+
+${REPEAT}:
+        @+make -C ${abs_top_srcdir}/tools/
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.