Changeset 0759ba0

Timestamp:

Jul 27, 2018, 3:16:48 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

2fa483c

Parents:

36463e2 (diff), f37279b (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (5 diffs)

Jenkinsfile

@@ -174 +174 @@
 
 def notify_server(int wait) {
-        sh """curl --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
+        sh """curl --silent --show-error --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
         return
 }
@@ -260 +260 @@
                 def install_dir = pwd tmp: true
 
-                //Output compiler version to help with debug
-                echo """C++ Compiler :"""
-                sh "which ${compiler.cpp_cc} && ${compiler.cpp_cc} --version"
-                echo """C   Compiler :"""
-                sh "which ${compiler.cfa_cc} && ${compiler.cfa_cc} --version"
-
-                //Configure the conpilation (Output is not relevant)
-                //Use the current directory as the installation target so nothing escapes the sandbox
-                //Also specify the compiler by hand
-                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
-
-                //Compile the project
-                sh 'make -j 8 --no-print-directory V=0 install'
+                // Build outside of the src tree to ease cleaning
+                sh "mkdir -p build"
+                dir ('build') {
+                        //Configure the conpilation (Output is not relevant)
+                        //Use the current directory as the installation target so nothing escapes the sandbox
+                        //Also specify the compiler by hand
+                        sh "../configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+
+                        //Compile the project
+                        sh 'make -j 8 --no-print-directory'
+                }
         }
 }
@@ -279 +277 @@
         build_stage('Test') {
 
-                //Run the tests from the tests directory
-                if ( do_alltests ) {
-                        sh 'make -C src/tests all-tests debug=yes --no-print-directory'
-                        sh 'make -C src/tests all-tests debug=no --no-print-directory'
-                }
-                else {
-                        sh 'make -C src/tests --no-print-directory'
+                dir ('build/src/tests') {
+                        //Run the tests from the tests directory
+                        if ( do_alltests ) {
+                                sh 'make all-tests debug=yes --no-print-directory'
+                                sh 'make all-tests debug=no --no-print-directory'
+                        }
+                        else {
+                                sh 'make --no-print-directory'
+                        }
                 }
         }
@@ -302 +302 @@
 def clean() {
         build_stage('Cleanup') {
-
-                //do a maintainer-clean to make sure we need to remake from scratch
-                sh 'make maintainer-clean > /dev/null'
+                // clean the build by wipping the build directory
+                sh 'rm -rf build'
         }
 }
@@ -329 +328 @@
 
                 //Then publish the results
-                sh 'curl -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
+                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
         }
 }