Changeset 7416e041

Timestamp:

Aug 2, 2016, 8:34:56 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

e80ebe5

Parents:

d0542c4 (diff), 155cce0f (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 plg2:software/cfa/cfa-cc

Files:

• Jenkins/FullBuild (modified) (3 diffs)
• src/tests/test.py (modified) (1 diff)

Jenkins/FullBuild

@@ -43 +43 @@
                 }
 
-                sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
+                //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
+                echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
 }
 
@@ -67 +68 @@
 
 node ('master') {
+        def err = null
+
         try {
                 //Prevent the build from exceeding 30 minutes
@@ -78 +81 @@
                                         results = [null, null]
 
-                                        // parallel (
-                                        //      x64: {
-                                        //              trigger_build('64-bit')
-                                        //      },
-                                        //      x32: {
-                                        //              trigger_build('32-bit')
-                                        //      }
-                                        // )
+                                        parallel (
+                                                x64: {
+                                                        trigger_build('64-bit')
+                                                },
+                                                x32: {
+                                                        trigger_build('32-bit')
+                                                }
+                                        )
 
                                 //Push latest changes to do-lang repo

src/tests/test.py

@@ -33 +33 @@
 def listTests():
         machineType = getMachineType()
-
-        #print(machineType)
 
         # tests directly in the .expect folder will always be processed