Changeset 5007618

Timestamp:

May 28, 2023, 8:31:29 AM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ast-experimental, master

Children:

4d5c855

Parents:

124400b

Message:

update tests/Makefile.am and corresponding Jenkinsfile with more specialized variables

Files:

• Jenkinsfile (modified) (2 diffs)
• tests/Makefile.am (modified) (4 diffs)

Jenkinsfile

@@ -155 +155 @@
                         dir (BuildDir) {
                                 //Run the tests from the tests directory
-                                sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
+                                sh """make ${jopt} --no-print-directory -C tests timeout=600 global-timeout=14400 tests debug=yes archive-errors=${BuildDir}/tests/crashes/full-debug"""
                         }
                 }
@@ -162 +162 @@
                         dir (BuildDir) {
                                 //Run the tests from the tests directory
-                                sh """make ${jopt} --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" tests debug=no archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+                                sh """make ${jopt} --no-print-directory -C tests timeout=600 global-timeout=14400 tests debug=no archive-errors=${BuildDir}/tests/crashes/full-nodebug"""
                         }
                 }

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat May 27 18:27:08 2023
-## Update Count     : 190
+## Last Modified On : Sun May 28 08:15:43 2023
+## Update Count     : 196
 ###############################################################################
 
@@ -27 +27 @@
 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=
 
 TEST_PY = python3 ${builddir}/test.py
@@ -108 +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} ${TIMEOUT} ${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} ${ARCH} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${ARCHIVE_ERRORS} ${ARCH} ${quick_test}
 
 concurrency :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${TIMEOUT} ${ARCH} -Iconcurrency
+        @+${TEST_PY} --debug=${debug} --install=${installed} ${ARCHIVE_ERRORS} ${TIMEOUT} ${GLOBAL_TIMEOUT} ${ARCH} -Iconcurrency
 
 list :
@@ -127 +129 @@
         @echo "user targets:"
         @echo "    Run the complete test suite."
-        @echo "    $$ make (null) / tests [debug=yes/no] [installed=yes/no] [timeout=integer-seconds] [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 concurrency test suite."
-        @echo "    $$ make concurrency [debug=yes/no] [installed=yes/no] [timeout=integer-seconds] [arch=${arch_support}]"
+        @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."