Changes in src/tests/Makefile.am [cbdf565:5cacf74]

File:

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

src/tests/Makefile.am

@@ -15 +15 @@
 ###############################################################################
 
-
 debug=yes
 
@@ -25 +24 @@
 concurrent='-Econcurrent'
 endif
-
-TEST_PY = python ${srcdir}/test.py
 
 # applies to both programs
@@ -44 +41 @@
 TEST_FLAGS = $(if $(test), 2> $(test), )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
-CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
+CC = @CFA_BINDIR@/@CFA_NAME@
 
 .PHONY : list
 EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
 
-fstream_test_SOURCES = ${srcdir}/fstream_test.c
+fstream_test_SOURCES = fstream_test.c
 fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
-avl_test_SOURCES = ${srcdir}/avltree/avl_test.c ${srcdir}/avltree/avl0.c ${srcdir}/avltree/avl1.c ${srcdir}/avltree/avl2.c ${srcdir}/avltree/avl3.c ${srcdir}/avltree/avl4.c ${srcdir}/avltree/avl-private.c
+avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
 avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 all-local :
-        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
+        @+python test.py --debug=${debug} ${concurrent} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug} ${concurrent}           # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -65 +62 @@
 
 list :
-        @+${TEST_PY} --list ${concurrent}
+        @+python test.py --list ${concurrent}
 
 concurrency :
-        @+${TEST_PY} --debug=${debug} -Iconcurrent
+        @+python test.py --debug=${debug} -Iconcurrent
 
-% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}
+.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 ${@}
 
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 extension : extension.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 functions: functions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
 
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
 
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
 
 raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) 2> ${@} -fsyntax-only
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only
 
 #builtins
 builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) 2> ${@} -fsyntax-only
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} 2> ${@} -fsyntax-only