Changes in / [7522692:19de7864]

Files:

• Jenkins/tools.groovy (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)
• libcfa/src/concurrency/kernel/startup.cfa (modified) (2 diffs)

Jenkins/tools.groovy

@@ -6 +6 @@
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
+// Global for the stage name
+StageName = ''
+
 // wrapper around stage declaretion to be more verbose
 // and allow showing as skipped in the UI
 def BuildStage(String name, boolean run, Closure block ) {
-        echo " -------- ${name} -------- "
+        StageName = name
+        echo " -------- ${StageName} -------- "
         if(run) {
                 stage(name, block)

Jenkinsfile

@@ -54 +54 @@
         //attach the build log to the email
         catch (Exception caughtError) {
-                // Store the result of the build log
-                currentBuild.result = "FAILURE"
-
-                // An error has occured, the build log is relevent
+                //rethrow error later
+                err = caughtError
+
+                echo err.toString()
+
+                //An error has occured, the build log is relevent
                 log_needed = true
 
-                // rethrow error later
-                err = caughtError
-
-                // print the error so it shows in the log
-                echo err.toString()
+                //Store the result of the build log
+                currentBuild.result = "${tools.StageName} FAILURE".trim()
         }
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -118 +118 @@
 
 extern size_t __page_size;
-extern int __map_prot;
 
 //-----------------------------------------------------------------------------
@@ -726 +725 @@
                 }
         #else
-                __cfaabi_dbg_debug_do(
-                        // pthread has no mechanism to create the guard page in user supplied stack.
-                        if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
-                                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
-                        } // if
-                );
                 free( stack );
         #endif