Changeset b015035 for Jenkinsfile

Timestamp:

Jun 21, 2016, 6:01:52 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8b52686

Parents:

df42128

Message:

Updated jenkins compilation to only use 1 compiler on pushes and update usage of tests

File:

• Jenkinsfile (modified) (2 diffs)

Jenkinsfile

@@ -33 +33 @@
                 dir ('src/tests') {
                         if (full_build) {
-                                sh 'python test.py --all'
+                                sh 'make all-tests'
                         }
                         else {
-                                sh './runTests.sh'
+                                sh 'make'
                         }
                 }
@@ -188 +188 @@
                                 cfa_build(doPromoteBuild2DoLang)
 
-                                //Compile using gcc-5
-                                currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                                cfa_build(doPromoteBuild2DoLang)
-
-                                //Compile using gcc-4.9
-                                currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                                cfa_build(doPromoteBuild2DoLang)
+                                if( doPromoteBuild2DoLang ) {
+                                        //Compile using gcc-5
+                                        currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                                        cfa_build(true)
+
+                                        //Compile using gcc-4.9
+                                        currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                                        cfa_build(true)
+                                }
 
                                 //Compile latex documentation