Changeset d0da7ed

Timestamp:

Jun 28, 2021, 3:52:07 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9380add

Parents:

44b37de (diff), 8a07213 (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

Files:

• Jenkinsfile (modified) (1 diff)
• tests/concurrent/signal/disjoint.cfa (modified) (2 diffs)

Jenkinsfile ¶

@@ -234 +234 @@
                 def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
                 def email_body = """<p>This is an automated email from the Jenkins build machine. It was
-                        generated because of a git hooks/post-receive script following
-                        a ref change which was pushed to the C\u2200 repository.</p>
-
-                        <p>- Status --------------------------------------------------------------</p>
-
-                        <p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
-                        <p>Check console output at ${env.BUILD_URL} to view the results.</p>
-                        """ + Tools.GitLogMessage()
+generated because of a git hooks/post-receive script following
+a ref change which was pushed to the C\u2200 repository.</p>
+
+<p>- Status --------------------------------------------------------------</p>
+
+<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+""" + Tools.GitLogMessage()
 
                 def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"

tests/concurrent/signal/disjoint.cfa ¶

@@ -77 +77 @@
         wait( cond );
         if( d.state != SIGNAL ) {
-                sout | "ERROR barging!";
+                abort | "ERROR barging!";
         }
 
@@ -113 +113 @@
         bool running = TEST(globals.data.counter < N) && globals.data.counter > 0;
         if( globals.data.state != SIGNAL && running ) {
-                sout | "ERROR Eager signal" | globals.data.state;
+                abort | "ERROR Eager signal" | globals.data.state;
         }
 }