Ignore:
Timestamp:
Oct 2, 2017, 6:02:32 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:
21b7161
Parents:
3096ec1 (diff), 617b4b2 (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/Makefile.in

    r3096ec1 r11a2d9b  
    320320@BUILD_CONCURRENCY_TRUE@concurrent = yes
    321321@BUILD_CONCURRENCY_FALSE@concurrent_test =
    322 @BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt
     322@BUILD_CONCURRENCY_TRUE@concurrent_test = \
     323@BUILD_CONCURRENCY_TRUE@        coroutine          \
     324@BUILD_CONCURRENCY_TRUE@        thread             \
     325@BUILD_CONCURRENCY_TRUE@        monitor            \
     326@BUILD_CONCURRENCY_TRUE@        multi-monitor      \
     327@BUILD_CONCURRENCY_TRUE@        preempt            \
     328@BUILD_CONCURRENCY_TRUE@        sched-int-block    \
     329@BUILD_CONCURRENCY_TRUE@        sched-int-disjoint \
     330@BUILD_CONCURRENCY_TRUE@        sched-int-wait     \
     331@BUILD_CONCURRENCY_TRUE@        sched-ext-barge    \
     332@BUILD_CONCURRENCY_TRUE@        sched-ext-dtor     \
     333@BUILD_CONCURRENCY_TRUE@        sched-ext-else     \
     334@BUILD_CONCURRENCY_TRUE@        sched-ext-parse    \
     335@BUILD_CONCURRENCY_TRUE@        sched-ext-recurse  \
     336@BUILD_CONCURRENCY_TRUE@        sched-ext-statment \
     337@BUILD_CONCURRENCY_TRUE@        sched-ext-when
     338
    323339
    324340# applies to both programs
Note: See TracChangeset for help on using the changeset viewer.