Changeset 4c1b9ea8


Ignore:
Timestamp:
Aug 15, 2019, 1:19:02 PM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
4c51aca
Parents:
3e93c00
Message:

Fix scope of archival for tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r3e93c00 r4c1b9ea8  
    155155
    156156def test() {
    157         build_stage('Test: short', !Settings.RunAllTests) {
    158                 dir (BuildDir) {
    159                         //Run the tests from the tests directory
    160                         sh 'make --no-print-directory -C tests'
    161                 }
    162         }
    163 
    164         build_stage('Test: full', Settings.RunAllTests) {
    165                 dir (BuildDir) {
    166                         try {
     157        try {
     158                build_stage('Test: short', !Settings.RunAllTests) {
     159                        dir (BuildDir) {
    167160                                //Run the tests from the tests directory
    168                                 sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
    169                                 sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
     161                                sh 'make --no-print-directory -C tests'
    170162                        }
    171                         catch (Exception err) {
    172                                 echo "Archiving core dumps"
    173                                 archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
    174                                 throw err
     163                }
     164
     165                build_stage('Test: full', Settings.RunAllTests) {
     166                        dir (BuildDir) {
     167                                        //Run the tests from the tests directory
     168                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/debug"""
     169                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/nodebug"""
    175170                        }
    176171                }
     172        }
     173        catch (Exception err) {
     174                echo "Archiving core dumps"
     175                archiveArtifacts artifacts: "${BuildDir}/tests/crashes", fingerprint: true
     176                throw err
    177177        }
    178178}
Note: See TracChangeset for help on using the changeset viewer.