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

File:

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

src/tests/Makefile.in

@@ -91 +91 @@
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
-@BUILD_DEBUG_FALSE@am__append_2 = -nodebug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_3 = -debug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_4 = ${DEBUG_FLAGS}
+@BUILD_DEBUG_FALSE@am__append_1 = -nodebug
+@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_2 = -debug
+@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_3 = ${DEBUG_FLAGS}
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
         avl_test$(EXEEXT)
@@ -314 +313 @@
 top_srcdir = @top_srcdir@
 debug = yes
-quick_test = vector_test avl_test operators numericConstants \
-        expression enum array typeof cast dtor-early-exit init_once \
-        attributes $(am__append_1)
-@BUILD_CONCURRENCY_FALSE@concurrent = no
-@BUILD_CONCURRENCY_TRUE@concurrent = yes
-@BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = \
-@BUILD_CONCURRENCY_TRUE@        coroutine               \
-@BUILD_CONCURRENCY_TRUE@        fmtLines                \
-@BUILD_CONCURRENCY_TRUE@        pingpong                \
-@BUILD_CONCURRENCY_TRUE@        prodcons                \
-@BUILD_CONCURRENCY_TRUE@        thread                  \
-@BUILD_CONCURRENCY_TRUE@        matrixSum               \
-@BUILD_CONCURRENCY_TRUE@        monitor                 \
-@BUILD_CONCURRENCY_TRUE@        multi-monitor           \
-@BUILD_CONCURRENCY_TRUE@        boundedBuffer           \
-@BUILD_CONCURRENCY_TRUE@        preempt                 \
-@BUILD_CONCURRENCY_TRUE@        sched-int-block         \
-@BUILD_CONCURRENCY_TRUE@        sched-int-disjoint      \
-@BUILD_CONCURRENCY_TRUE@        sched-int-wait          \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-barge         \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-dtor          \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-else          \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-parse         \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-recurse       \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-statment      \
-@BUILD_CONCURRENCY_TRUE@        sched-ext-when
-
+quick_test = vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes
+@BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
+@BUILD_CONCURRENCY_TRUE@concurrent = 
 
 # applies to both programs
 DEBUG_FLAGS = 
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ \
-        $(am__append_2) $(am__append_3) $(am__append_4)
-TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
+        $(am__append_1) $(am__append_2) $(am__append_3)
+TEST_FLAGS = $(if $(test), 2> $(test), )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 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: all-am
 
@@ -833 +807 @@
 
 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 :
@@ -842 +816 @@
 
 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@