Changeset 3ce2425

Timestamp:

Sep 9, 2019, 5:00:05 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:

216597d

Parents:

3315e3d (diff), 655c5fa (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 'jenkins-sandbox'

Files:

• Jenkinsfile (modified) (1 diff)
• tests/pybin/tools.py (modified) (1 diff)

Jenkinsfile

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

tests/pybin/tools.py

@@ -311 +311 @@
 
 def core_archive(dst, name, exe):
-        # Get the files to copy
+        # Get the core dump
         core = os.path.join(os.getcwd(), "core" )
 
-        # Uncomment if we want timestamps on coredumps
-        # dst  = os.path.join(dst, "%s_%s" % (name, pretty_now()))
+        # update the path for this test
+        dst  = os.path.join(dst, name)
 
         # make a directory for this test
+        # mkdir makes the parent directory only so add a dummy
         mkdir(os.path.join(dst, "dir"))