Changeset 66f8528 for src/tests/Makefile.am

Timestamp:

Dec 15, 2016, 5:16:42 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, 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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

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

src/tests/Makefile.am

@@ -15 +15 @@
 ###############################################################################
 
+debug=yes
+
 # applies to both programs
-CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
+EXTRA_FLAGS =
+CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
 CC = @CFA_BINDIR@/cfa
 
@@ -30 +33 @@
 
 all-tests :
-        @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -54 +57 @@
 
 declarationSpecifier: declarationSpecifier.c
-        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
@@ -63 +66 @@
 
 memberCtors-ERR1: memberCtors.c
-        ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 completeTypeError : completeTypeError.c
-        ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
+        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}