Changeset cde3891 for Jenkinsfile

Timestamp:

Jan 23, 2019, 4:52:16 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

a200795

Parents:

9b086ca (diff), 1d832f4 (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' into cleanup-dtors

File:

• Jenkinsfile (modified) (9 diffs)

Jenkinsfile

@@ -4 +4 @@
 // Main loop of the compilation
 //===========================================================================================================
-node ('master'){
-
+
+node('master') {
         // Globals
-        BuildDir  = pwd tmp: true
-        SrcDir    = pwd tmp: false
+        BuildDir  = null
+        SrcDir    = null
         Settings  = null
         StageName = ''
@@ -26 +26 @@
                         Settings = prepare_build()
 
-                        clean()
-
-                        checkout()
-
-                        notify_server(0)
-
-                        build()
-
-                        test()
-
-                        benchmark()
-
-                        build_doc()
-
-                        publish()
+                        node(Settings.Architecture.node) {
+                                BuildDir  = pwd tmp: true
+                                SrcDir    = pwd tmp: false
+
+                                clean()
+
+                                checkout()
+
+                                notify_server(0)
+
+                                build()
+
+                                test()
+
+                                benchmark()
+
+                                build_doc()
+
+                                publish()
+                        }
 
                         notify_server(45)
@@ -75 +80 @@
         }
 }
-
 //===========================================================================================================
 // Main compilation routines
@@ -114 +118 @@
                         }
 
-                        sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
 
                         //Compile the project
@@ -128 +132 @@
                         //Run the tests from the tests directory
                         if ( Settings.RunAllTests ) {
-                                sh 'make --no-print-directory -C tests all-tests debug=yes'
-                                sh 'make --no-print-directory -C tests all-tests debug=no '
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests timeouts="--timeout=600" all-tests debug=no '
                         }
                         else {
@@ -235 +239 @@
 //Description of a compiler (Must be serializable since pipelines are persistent)
 class CC_Desc implements Serializable {
-        public String cc_name
-        public String cpp_cc
-        public String cfa_cc
-
-        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-                this.cc_name = cc_name
-                this.cpp_cc = cpp_cc
-                this.cfa_cc = cfa_cc
+        public String name
+        public String CXX
+        public String CC
+
+        CC_Desc(String name, String CXX, String CC) {
+                this.name = name
+                this.CXX = CXX
+                this.CC = CC
         }
 }
@@ -250 +254 @@
         public String name
         public String flags
-
-        Arch_Desc(String name, String flags) {
+        public String node
+
+        Arch_Desc(String name, String flags, String node) {
                 this.name  = name
                 this.flags = flags
+                this.node  = node
         }
 }
@@ -292 +298 @@
                 switch( param.Architecture ) {
                         case 'x64':
-                                this.Architecture = new Arch_Desc('x64', '--host=x86_64')
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
                         break
                         case 'x86':
-                                this.Architecture = new Arch_Desc('x86', '--host=i386')
+                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
                         break
                         default :
@@ -309 +315 @@
 
                 def full = param.RunAllTests ? " (Full)" : ""
-                this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
-
-                this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+
+                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }