Changeset 8a930c03 for tests/Makefile.am

Timestamp:

Jun 12, 2023, 12:05:58 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/Makefile.am (modified) (8 diffs)

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue May 16 09:27:48 2023
-## Update Count     : 178
+## Last Modified On : Sun May 28 08:15:43 2023
+## Update Count     : 196
 ###############################################################################
 
@@ -26 +26 @@
 ARCH = ${if ${arch},"--arch=${arch}"}
 arch_support = "x86/x64/arm"
+TIMEOUT = ${if ${timeout},"--timeout=${timeout}"}
+GLOBAL_TIMEOUT = ${if ${global-timeout},"--global-timeout=${global-timeout}"}
+ARCHIVE_ERRORS = ${if ${archive-errors},"--archive-errors=${archive-errors}"}
+
 DEBUG_FLAGS = -debug -g -O0
 
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes meta/dumpable
-
-archiveerrors=
-concurrent=
-timeouts=
 
 TEST_PY = python3 ${builddir}/test.py
@@ -67 +67 @@
 PRETTY_PATH = mkdir -p ${dir ${abspath ${@}}} && cd ${srcdir} &&
 
-.PHONY : list .validate .test_makeflags
+.PHONY : concurrency list .validate .test_makeflags
 .INTERMEDIATE : .validate .validate.cfa .test_makeflags
 EXTRA_PROGRAMS = avl_test linkonce linking/mangling/anon .dummy_hack # build but do not install
@@ -79 +79 @@
         avltree/avl-private.h \
         avltree/avl.h \
-        concurrent/clib_tls.c \
-        concurrent/clib.c \
         configs/.in/parseconfig-all.txt \
         configs/.in/parseconfig-errors.txt \
@@ -89 +87 @@
         io/.in/many_read.data \
         meta/fork+exec.hfa \
-        concurrent/unified_locking/mutex_test.hfa \
-        concurrent/channels/parallel_harness.hfa
+        concurrency/clib_tls.c \
+        concurrency/clib.c \
+        concurrency/unified_locking/mutex_test.hfa \
+        concurrency/channels/parallel_harness.hfa
 
 dist-hook:
@@ -109 +109 @@
 #----------------------------------------------------------------------------------------------------------------
 
+# '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 all-local : # This name is important to automake and implies the default build target.
-        @+${TEST_PY} --debug=${debug} --install=${installed} --invariant --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${ARCH} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
-
-install : all-local # PAB only
-
-tests : all-local
+        @+${TEST_PY} --debug=${debug} --install=${installed} --invariant ${ARCHIVE_ERRORS} ${TIMEOUT} ${GLOBAL_TIMEOUT} ${ARCH} --all
+
+tests : all-local # synonym
+
+install : all-local  # synonym, PAB only
 
 quick :
-        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${ARCH} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${ARCHIVE_ERRORS} ${ARCH} ${quick_test}
 
 concurrency :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${ARCH} -Iconcurrent
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${ARCHIVE_ERRORS} ${TIMEOUT} ${GLOBAL_TIMEOUT} ${ARCH} -Iconcurrency
 
 list :
-        @+${TEST_PY} --list ${concurrent}
+        @+${TEST_PY} --list
 
 help :
         @echo "user targets:"
         @echo "    Run the complete test suite."
-        @echo "    $$ make (null) / tests [debug=yes/no] [installed=yes/no] [arch=${arch_support}]"
+        @echo "    $$ make (null) / tests [debug=yes/no] [installed=yes/no] [archive-errors=dump-dir] [timeout=seconds] [global-timeout=seconds] [arch=${arch_support}]"
         @echo ""
         @echo "    Run the short (quick) test suite."
-        @echo "    $$ make quick [debug=yes/no] [installed=yes/no] [arch=${arch_support}]"
+        @echo "    $$ make quick [debug=yes/no] [installed=yes/no] [archive-errors=dump-dir] [arch=${arch_support}]"
         @echo ""
-        @echo "    Run the concurrent test suite."
-        @echo "    $$ make concurrency [debug=yes/no] [installed=yes/no] [arch=${arch_support}]"
+        @echo "    Run the concurrency test suite."
+        @echo "    $$ make concurrency [debug=yes/no] [installed=yes/no] [archive-errors=dump-dir] [timeout=seconds] [global-timeout=seconds] [arch=${arch_support}]"
         @echo ""
         @echo "    List all tests in the test suite."
@@ -204 +205 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator \
-        init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment concurrent/waitfor/parse
+        init1 limits nested-types cast labelledExit array quasiKeyword include/stdincludes include/includes builtins/sync warnings/self-assignment concurrency/waitfor/parse
 ${SYNTAX_ONLY_CODE} : % : %.cfa ${CFACCBIN}
         ${CFACOMPILE_SYNTAX}
@@ -211 +212 @@
 # expected failures
 # use custom target since they require a custom define *and* have a name that doesn't match the file
+
+array-ERR1 : array.cfa ${CFACCBIN}
+        ${CFACOMPILE_SYNTAX} -DERR1
+        -cp ${test} ${abspath ${@}}
+
+array-ERR2 : array.cfa ${CFACCBIN}
+        ${CFACOMPILE_SYNTAX} -DERR2
+        -cp ${test} ${abspath ${@}}
+
+array-ERR3 : array.cfa ${CFACCBIN}
+        ${CFACOMPILE_SYNTAX} -DERR3
+        -cp ${test} ${abspath ${@}}
+
 alloc-ERROR : alloc.cfa ${CFACCBIN}
         ${CFACOMPILE_SYNTAX} -DERR1