Changeset 0759ba0


Ignore:
Timestamp:
Jul 27, 2018, 3:16:48 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r36463e2 r0759ba0  
    174174
    175175def notify_server(int wait) {
    176         sh """curl --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
     176        sh """curl --silent --show-error --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
    177177        return
    178178}
     
    260260                def install_dir = pwd tmp: true
    261261
    262                 //Output compiler version to help with debug
    263                 echo """C++ Compiler :"""
    264                 sh "which ${compiler.cpp_cc} && ${compiler.cpp_cc} --version"
    265                 echo """C   Compiler :"""
    266                 sh "which ${compiler.cfa_cc} && ${compiler.cfa_cc} --version"
    267 
    268                 //Configure the conpilation (Output is not relevant)
    269                 //Use the current directory as the installation target so nothing escapes the sandbox
    270                 //Also specify the compiler by hand
    271                 sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
    272 
    273                 //Compile the project
    274                 sh 'make -j 8 --no-print-directory V=0 install'
     262                // Build outside of the src tree to ease cleaning
     263                sh "mkdir -p build"
     264                dir ('build') {
     265                        //Configure the conpilation (Output is not relevant)
     266                        //Use the current directory as the installation target so nothing escapes the sandbox
     267                        //Also specify the compiler by hand
     268                        sh "../configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
     269
     270                        //Compile the project
     271                        sh 'make -j 8 --no-print-directory'
     272                }
    275273        }
    276274}
     
    279277        build_stage('Test') {
    280278
    281                 //Run the tests from the tests directory
    282                 if ( do_alltests ) {
    283                         sh 'make -C src/tests all-tests debug=yes --no-print-directory'
    284                         sh 'make -C src/tests all-tests debug=no --no-print-directory'
    285                 }
    286                 else {
    287                         sh 'make -C src/tests --no-print-directory'
     279                dir ('build/src/tests') {
     280                        //Run the tests from the tests directory
     281                        if ( do_alltests ) {
     282                                sh 'make all-tests debug=yes --no-print-directory'
     283                                sh 'make all-tests debug=no --no-print-directory'
     284                        }
     285                        else {
     286                                sh 'make --no-print-directory'
     287                        }
    288288                }
    289289        }
     
    302302def clean() {
    303303        build_stage('Cleanup') {
    304 
    305                 //do a maintainer-clean to make sure we need to remake from scratch
    306                 sh 'make maintainer-clean > /dev/null'
     304                // clean the build by wipping the build directory
     305                sh 'rm -rf build'
    307306        }
    308307}
     
    329328
    330329                //Then publish the results
    331                 sh 'curl -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     330                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
    332331        }
    333332}
Note: See TracChangeset for help on using the changeset viewer.