Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision ddee972aabb3873f2db30019c9662d1c90795b43)
+++ Jenkinsfile	(revision 3e93c0088aec48e200e90a94575f4ae2efc29ed1)
@@ -164,11 +164,13 @@
 	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"""
-
-			def must_archive = fileExists "${BuildDir}/tests/crashes"
-			if(must_archive) {
+			try {
+				//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
 			}
 		}