Changeset 38bfe05b

Timestamp:

May 26, 2017, 6:56:19 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8c700c1, 8f61052c

Parents:

01b9928 (diff), 5c69a1e (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:/u/cforall/software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (3 diffs)
• src/tests/.expect/32/math.txt (modified) (1 diff)
• src/tests/sched-int-block.c (modified) (1 diff)

Jenkinsfile

@@ -28 +28 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        notify_server()
+                        notify_server(1)
 
                         prepare_build()
@@ -46 +46 @@
                         publish()
 
-                        notify_server()
+                        notify_server(45)
                 }
         }
@@ -171 +171 @@
 }
 
-def notify_server() {
-        sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null || true'
+def notify_server(int wait) {
+        sh """curl --silent --data "wait=${wait}" -X POST http://plg2:8082/jenkins/notify > /dev/null || true"""
         return
 }

src/tests/.expect/32/math.txt

@@ -22 +22 @@
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
 tan:1.55741 1.5574077246549 1.55740772465490223 0.271753+1.08392i 0.271752585319512+1.08392332733869i 0.271752585319511717+1.08392332733869454i
-asin:1.5708 1.5707963267949 1.57079632679489662 0.666239+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
+asin:1.5708 1.5707963267949 1.57079632679489662 0.66624+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
 acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
 atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i

src/tests/sched-int-block.c

@@ -8 +8 @@
 
 enum state_t { WAITED, SIGNAL, BARGE };
-
-monitor global_t {};
 
 monitor global_data_t {