Changeset 6840e7c for src/tests/Makefile.in

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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 cleanup-dtors

File:

• src/tests/Makefile.in (modified) (2 diffs)

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-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
+@BUILD_CONCURRENCY_TRUE@concurrent_test = \
+@BUILD_CONCURRENCY_TRUE@        coroutine               \
+@BUILD_CONCURRENCY_TRUE@        fmtLines                \
+@BUILD_CONCURRENCY_TRUE@        pingpong                \
+@BUILD_CONCURRENCY_TRUE@        prodcons                \
+@BUILD_CONCURRENCY_TRUE@        thread                  \
+@BUILD_CONCURRENCY_TRUE@        matrixSum               \
+@BUILD_CONCURRENCY_TRUE@        monitor                 \
+@BUILD_CONCURRENCY_TRUE@        multi-monitor           \
+@BUILD_CONCURRENCY_TRUE@        boundedBuffer           \
+@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
@@ -865 +886 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
+ctor-autogen-ERR1: ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}