Ignore:
Timestamp:
Oct 12, 2017, 1:23:08 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
0aaac0e
Parents:
ca278c1 (diff), fa4c094 (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.in

    rca278c1 rb10c621c  
    321321@BUILD_CONCURRENCY_FALSE@concurrent_test =
    322322@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 \
     323@BUILD_CONCURRENCY_TRUE@        coroutine               \
     324@BUILD_CONCURRENCY_TRUE@        fmtLines                \
     325@BUILD_CONCURRENCY_TRUE@        pingpong                \
     326@BUILD_CONCURRENCY_TRUE@        prodcons                \
     327@BUILD_CONCURRENCY_TRUE@        thread                  \
     328@BUILD_CONCURRENCY_TRUE@        matrixSum               \
     329@BUILD_CONCURRENCY_TRUE@        monitor                 \
     330@BUILD_CONCURRENCY_TRUE@        multi-monitor           \
     331@BUILD_CONCURRENCY_TRUE@        boundedBuffer           \
     332@BUILD_CONCURRENCY_TRUE@        preempt                 \
     333@BUILD_CONCURRENCY_TRUE@        sched-int-block         \
     334@BUILD_CONCURRENCY_TRUE@        sched-int-disjoint      \
     335@BUILD_CONCURRENCY_TRUE@        sched-int-wait          \
     336@BUILD_CONCURRENCY_TRUE@        sched-ext-barge         \
     337@BUILD_CONCURRENCY_TRUE@        sched-ext-dtor          \
     338@BUILD_CONCURRENCY_TRUE@        sched-ext-else          \
     339@BUILD_CONCURRENCY_TRUE@        sched-ext-parse         \
     340@BUILD_CONCURRENCY_TRUE@        sched-ext-recurse       \
     341@BUILD_CONCURRENCY_TRUE@        sched-ext-statment      \
    337342@BUILD_CONCURRENCY_TRUE@        sched-ext-when
    338343
Note: See TracChangeset for help on using the changeset viewer.