Changes in / [3ce2425:3315e3d]

Files:

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

Jenkinsfile

@@ -155 +155 @@
 
 def test() {
-        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) {
-                        archiveArtifacts artifacts: "tests/crashes/**/*", fingerprint: true
-                }
-                throw err
+        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) {
+                        //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 '
+                }
         }
 }

tests/pybin/tools.py

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