Changeset 1155718 for src/tests

Timestamp:

Oct 2, 2017, 6:37:31 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:

e1ff775

Parents:

bd3d9e4 (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 plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/concurrent/sched-ext-dtor.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• sched-ext-dtor.c (added)

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent = yes
 quick_test += coroutine thread monitor
-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
+concurrent_test =        \
+        coroutine          \
+        thread             \
+        monitor            \
+        multi-monitor      \
+        preempt            \
+        sched-int-block    \
+        sched-int-disjoint \
+        sched-int-wait     \
+        sched-ext-barge    \
+        sched-ext-dtor     \
+        sched-ext-else     \
+        sched-ext-parse    \
+        sched-ext-recurse  \
+        sched-ext-statment \
+        sched-ext-when
+
 else
 concurrent=no

src/tests/Makefile.in

@@ -320 +320 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@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
+@BUILD_CONCURRENCY_TRUE@concurrent_test = \
+@BUILD_CONCURRENCY_TRUE@        coroutine          \
+@BUILD_CONCURRENCY_TRUE@        thread             \
+@BUILD_CONCURRENCY_TRUE@        monitor            \
+@BUILD_CONCURRENCY_TRUE@        multi-monitor      \
+@BUILD_CONCURRENCY_TRUE@        preempt            \
+@BUILD_CONCURRENCY_TRUE@        sched-int-block    \
+@BUILD_CONCURRENCY_TRUE@        sched-int-disjoint \
+@BUILD_CONCURRENCY_TRUE@        sched-int-wait     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-barge    \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-dtor     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-else     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-parse    \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-recurse  \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-statment \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-when
+
 
 # applies to both programs