Changeset b90aace

Timestamp:

Sep 25, 2018, 11:02:00 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

7428ad9

Parents:

13a984c

Message:

Jenkins full build now uses 10 min timeouts

Files:

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

Jenkinsfile

@@ -128 +128 @@
                         //Run the tests from the tests directory
                         if ( Settings.RunAllTests ) {
-                                sh 'make --no-print-directory -C tests all-tests debug=yes'
-                                sh 'make --no-print-directory -C tests all-tests debug=no '
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=no '
                         }
                         else {
-                                sh 'make --no-print-directory -C tests'
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=600"'
                         }
                 }

tests/Makefile.am

@@ -23 +23 @@
 
 concurrent=
+timeouts=
 
 TEST_PY = python ${builddir}/test.py
@@ -50 +51 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :