Changeset 91788fa for src/tests/Makefile.am

Timestamp:

Jul 25, 2018, 6:23:58 PM (8 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (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

File:

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

src/tests/Makefile.am

@@ -15 +15 @@
 ###############################################################################
 
+
 debug=yes
 
@@ -24 +25 @@
 concurrent='-Econcurrent'
 endif
+
+TEST_PY = python ${srcdir}/test.py
 
 # applies to both programs
@@ -41 +44 @@
 TEST_FLAGS = $(if $(test), 2> $(test), )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
-CC = @CFA_BINDIR@/@CFA_NAME@
+CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/"
 
 .PHONY : list
@@ -53 +56 @@
 
 all-local :
-        @+python test.py --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug} ${concurrent}           # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -62 +65 @@
 
 list :
-        @+python test.py --list ${concurrent}
+        @+${TEST_PY} --list ${concurrent}
 
 concurrency :
-        @+python test.py --debug=${debug} -Iconcurrent
+        @+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
-
-
-% : %.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
+% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
+        $(COMPILE) $(abspath ${<}) -o ${@}
 
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 functions: functions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
+        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
 
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
 builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
+        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only