Changeset 6d44da1 for Jenkinsfile

Timestamp:

Sep 25, 2018, 11:35:34 AM (7 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:

c6bbcdb

Parents:

341bb80 (diff), 7428ad9 (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' into shared_library

File:

• Jenkinsfile (modified) (1 diff)

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 {