Changeset 579263a for src/tests/Makefile.am

Timestamp:

Jun 26, 2017, 4:48:35 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

bb1cd95

Parents:

e4d829b (diff), 2a7b3ca (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 designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:

• src/tests/Makefile.am (modified) (3 diffs)

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu May 25 14:39:15 2017
-## Update Count     : 43
+## Last Modified On : Thu Jun  8 07:41:43 2017
+## Update Count     : 44
 ###############################################################################
 
@@ -20 +20 @@
 
 if BUILD_CONCURRENCY
-concurrent=yes
-quick_test+= coroutine thread monitor
-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
+concurrent = yes
+quick_test += coroutine thread monitor
+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
 else
 concurrent=no
@@ -57 +57 @@
         @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
 
-.dummy : .dummy.c
+.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
 
-dtor-early-exit-ERR1: dtor-early-exit.c
+
+% : %.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${CFLAGS} ${<} -o ${@}
+
+dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-dtor-early-exit-ERR2: dtor-early-exit.c
+dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
-declarationSpecifier: declarationSpecifier.c
+declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gccExtensions : gccExtensions.c
+gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-extension : extension.c
+extension : extension.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-attributes : attributes.c
+attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-KRfunctions : KRfunctions.c
+KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gmp : gmp.c
+gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c
+memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-completeTypeError : completeTypeError.c
+completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}