Changeset cf67057 for src

Timestamp:

Apr 25, 2017, 11:59:42 AM (8 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:

86c8fd6

Parents:

9fcb5e4 (diff), 278516c (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

Location:

src/tests

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent=yes
 quick_test+= coroutine thread monitor
+concurrent_test=coroutine thread monitor multi-monitor sched-int sched-ext preempt
 else
 concurrent=no
+concurrent_test=
 endif
 
@@ -51 +53 @@
 list :
         @+python test.py --list --concurrent=${concurrent}
+
+concurrency :
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
 
 .dummy : .dummy.c

src/tests/Makefile.in

@@ -229 +229 @@
 @BUILD_CONCURRENCY_FALSE@concurrent = no
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
+@BUILD_CONCURRENCY_FALSE@concurrent_test = 
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int sched-ext preempt
 
 # applies to both programs
@@ -670 +672 @@
         @+python test.py --list --concurrent=${concurrent}
 
+concurrency :
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
+
 .dummy : .dummy.c
         ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test