Changes in src/tests/Makefile.am [481115f:0ad0c55]

File:

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

src/tests/Makefile.am

@@ -20 +20 @@
 
 if BUILD_CONCURRENCY
-concurrent = yes
-quick_test += coroutine thread monitor
-concurrent_test =               \
-        coroutine               \
-        fmtLines                \
-        pingpong                \
-        prodcons                \
-        thread                  \
-        matrixSum               \
-        monitor                 \
-        multi-monitor           \
-        boundedBuffer           \
-        preempt                 \
-        sched-int-block         \
-        sched-int-disjoint      \
-        sched-int-wait          \
-        sched-ext-barge         \
-        sched-ext-dtor          \
-        sched-ext-else          \
-        sched-ext-parse         \
-        sched-ext-recurse       \
-        sched-ext-statment      \
-        sched-ext-when
+concurrent=
 else
-concurrent=no
-concurrent_test=
+concurrent='-Econcurrent'
 endif
 
@@ -62 +39 @@
 endif
 
-TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
+TEST_FLAGS = $(if $(test), 2> $(test), )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
@@ -70 +47 @@
 
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> .err/fstream_test.log, ) ${BUILD_FLAGS}
+fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
-vector_test_CFLAGS = $(if $(test), 2>> .err/vector_test.log, ) ${BUILD_FLAGS}
+vector_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 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>> .err/avl_test.log, ) ${BUILD_FLAGS}
+avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 all-local :
-        @+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
+        @+python test.py --debug=${debug} ${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug} --concurrent=${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 :
@@ -88 +65 @@
 
 list :
-        @+python test.py --list --concurrent=${concurrent}
+        @+python test.py --list ${concurrent}
 
 concurrency :
-        @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
+        @+python test.py --debug=${debug} ${concurrent} ${concurrent_test}
 
 .dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@