Changeset 0dc3ac3

Timestamp:

Jul 30, 2018, 1:48:17 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:

73787a9

Parents:

a4248de1

Message:

Modified jenkins to use the temporary workspace as the build directory

Files:

• Jenkinsfile (modified) (7 diffs)
• src/tests/Makefile.in (modified) (1 diff)

Jenkinsfile

@@ -32 +32 @@
                         prepare_build()
 
+                        clean()
+
                         checkout()
 
@@ -41 +43 @@
 
                         benchmark()
-
-                        clean()
 
                         build_doc()
@@ -241 +241 @@
 // Main compilation routines
 //===========================================================================================================
+def clean() {
+        build_stage('Cleanup') {
+                // clean the build by wipping the build directory
+                sh "rm -rf ${builddir}/*"
+
+                //Clean all temporary files to make sure no artifacts of the previous build remain
+                sh 'git clean -fdqx'
+
+                //Reset the git repo so no local changes persist
+                sh 'git reset --hard'
+        }
+}
+
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
@@ -246 +259 @@
                 //checkout the source code and clean the repo
                 checkout scm
-
-                //Clean all temporary files to make sure no artifacts of the previous build remain
-                sh 'git clean -fdqx'
-
-                //Reset the git repo so no local changes persist
-                sh 'git reset --hard'
         }
 }
@@ -258 +265 @@
         build_stage('Build') {
 
-                def install_dir = pwd tmp: true
+                builddir = pwd tmp: true
+                srcdir   = pwd tmp: false
 
                 // Build outside of the src tree to ease cleaning
-                sh "mkdir -p build"
-                dir ('build') {
+                dir (builddir) {
                         //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"
+                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
 
                         //Compile the project
@@ -277 +284 @@
         build_stage('Test') {
 
-                //Run the tests from the tests directory
-                if ( do_alltests ) {
-                        sh 'make -C build/src/tests all-tests debug=yes --no-print-directory'
-                        sh 'make -C build/src/tests all-tests debug=no --no-print-directory'
-                }
-                else {
-                        sh 'make -C build/src/tests --no-print-directory'
+                dir (builddir) {
+                        //Run the tests from the tests directory
+                        if ( do_alltests ) {
+                                sh 'make --no-print-directory -C src/tests all-tests debug=yes'
+                                sh 'make --no-print-directory -C src/tests all-tests debug=no '
+                        }
+                        else {
+                                sh 'make --no-print-directory -C src/tests'
+                        }
                 }
         }
@@ -293 +302 @@
                 if( !do_benchmark ) return
 
-                //Append bench results
-                sh 'make -C build/src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
-        }
-}
-
-def clean() {
-        build_stage('Cleanup') {
-                // clean the build by wipping the build directory
-                sh 'rm -rf build'
+                dir (builddir) {
+                        //Append bench results
+                        sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
+                }
         }
 }

src/tests/Makefile.in

@@ -311 +311 @@
 
 # SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
-# however, here it is more complicated because it must match the dependencies exactly
-# depencies seem to have the absolute path to the build directory and relative path
-# to the headers from there
+# however, here it is more complicated because it must match the dependencies based on how
+# they are generated by gcc
 headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
 headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))