Changeset 944a90f for Jenkinsfile

Timestamp:

Jul 30, 2018, 11:27:44 AM (7 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:

ad486c5b

Parents:

7fb69f6 (diff), a4248de1 (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) (2 diffs)

Jenkinsfile

@@ -277 +277 @@
         build_stage('Test') {
 
-                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'
-                        }
+                //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'
                 }
         }
@@ -296 +294 @@
 
                 //Append bench results
-                sh 'make -C src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
+                sh 'make -C build/src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
         }
 }