Changeset 76c5d6e

Timestamp:

May 31, 2016, 1:36:20 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6be8514

Parents:

7f8b740 (diff), 84f53b4 (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 'master' of plg2:software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (1 diff)
• src/examples/runTests.sh (modified) (4 diffs)

Jenkinsfile

@@ -1 +1 @@
 
 
-//checkout the source code and clean the repo
-stage 'Checkout'
-node {
-        checkout scm
-        sh 'git clean -dfq'
-}
+node ('master'){
 
+        def err = null
+        def stage_name
+        def log_needed = false
+        currentBuild.result = "SUCCESS"
 
-stage 'Build'
-node ('master'){
         try {
-                //configure the conpilation
-                //Don't remove outputs for the clean and configure unless errors are present
-                sh 'make clean > /dev/null'
-                sh 'CC=gcc-4.9 CXX=g++-4.9 ./configure > /dev/null'
-                sh 'make -j 8'
-                email("SUCCESS", false)
 
-        //something happen, this build is a failure
-        } catch (Exception e) {
-                email("FAILURE", true)
-                throw e;
+                stage 'Checkout'
+
+                        //checkout the source code and clean the repo
+                        checkout scm
+                        sh 'git clean -dfq'
+
+                stage 'Build'
+
+                        stage_name = 'Build'
+
+                        //configure the conpilation
+                        //Don't remove outputs for the clean and configure unless errors are present
+                        sh 'make clean > /dev/null'
+                        sh 'CC=gcc-4.9 CXX=g++-4.9 ./configure > /dev/null'
+                        sh 'make -j 8'
+
+                stage 'Test'
+
+                        stage_name = 'Test'
+
+                        dir ('src/examples') {
+                                sh './runTests.sh'
+                        }
+
+                stage 'Cleanup'
+
+                        email("SUCCESS", false)
+        }
+
+        catch (Exception caughtError) {
+                err = caughtError
+                log_needed = false
+                currentBuild.result = "FAILURE"
+
+                switch(stage_name) {
+                        case 'Test' :
+                                currentBuild.result = "TEST FAILURE"
+                                break
+                        default :
+                                break
+                }
+        }
+
+        finally {
+                //Send email with final results
+                email(currentBuild.result, log_needed)
+
+                /* Must re-throw exception to propagate error */
+                if (err) {
+                        throw err
+                }
         }
 }

src/examples/runTests.sh

@@ -36 +36 @@
 make clean > /dev/null 2>&1
 
+ret_val=0
+
 for test in $tests; do
         echo -n "    $test" | tee -a $logfile
@@ -41 +43 @@
         # build, skipping to next test on error
         if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
+                ret_val=1
                 echo -e "\tFAILED with build error:" | tee -a $logfile
                 cat tests/$test.make.txt | tee -a $logfile
@@ -50 +53 @@
         ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
         if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
+                ret_val=1
                 echo -e "\tFAILED with output mismatch:" | tee -a $logfile
                 cat tests/$test.diff.txt | tee -a $logfile
@@ -58 +62 @@
         echo -e "\tPASSED" | tee -a $logfile
 done
+
+exit $((ret_val))