Ignore:
Timestamp:
Jun 29, 2017, 5:13:42 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
435e75f
Parents:
62423350 (diff), 1abc5ab (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' into designations

File:
1 edited

Legend:

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

    r62423350 ra12d5aa  
    1616
    1717repeats=10
    18 max_time=10
    19 N=10ul
     18max_time=30
    2019preempt=10_000ul
    2120
    2221REPEAT = ${abs_top_srcdir}/tools/repeat -s
    2322
    24 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
     23BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
    2524CFLAGS = ${BUILD_FLAGS}
    2625CC = @CFA_BINDIR@/@CFA_NAME@
    2726
    28 TESTS = create stack yield
     27TESTS = barge block create disjoint processor stack wait yield
    2928
    3029.INTERMEDIATE: ${TESTS}
Note: See TracChangeset for help on using the changeset viewer.