Changeset 4c1b9ea8

Timestamp:

Aug 15, 2019, 1:19:02 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4c51aca

Parents:

3e93c00

Message:

Fix scope of archival for tests

File:

• Jenkinsfile (modified) (1 diff)

Jenkinsfile

@@ -155 +155 @@
 
 def test() {
-        build_stage('Test: short', !Settings.RunAllTests) {
-                dir (BuildDir) {
-                        //Run the tests from the tests directory
-                        sh 'make --no-print-directory -C tests'
-                }
-        }
-
-        build_stage('Test: full', Settings.RunAllTests) {
-                dir (BuildDir) {
-                        try {
+        try {
+                build_stage('Test: short', !Settings.RunAllTests) {
+                        dir (BuildDir) {
                                 //Run the tests from the tests directory
-                                sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
-                                sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
+                                sh 'make --no-print-directory -C tests'
                         }
-                        catch (Exception err) {
-                                echo "Archiving core dumps"
-                                archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
-                                throw err
+                }
+
+                build_stage('Test: full', Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                        //Run the tests from the tests directory
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
                         }
                 }
+        }
+        catch (Exception err) {
+                echo "Archiving core dumps"
+                archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
+                throw err
         }
 }