Changeset d0da7ed


Ignore:
Timestamp:
Jun 28, 2021, 3:52:07 PM (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r44b37de rd0da7ed  
    234234                def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
    235235                def email_body = """<p>This is an automated email from the Jenkins build machine. It was
    236                         generated because of a git hooks/post-receive script following
    237                         a ref change which was pushed to the C\u2200 repository.</p>
    238 
    239                         <p>- Status --------------------------------------------------------------</p>
    240 
    241                         <p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
    242                         <p>Check console output at ${env.BUILD_URL} to view the results.</p>
    243                         """ + Tools.GitLogMessage()
     236generated because of a git hooks/post-receive script following
     237a ref change which was pushed to the C\u2200 repository.</p>
     238
     239<p>- Status --------------------------------------------------------------</p>
     240
     241<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
     242<p>Check console output at ${env.BUILD_URL} to view the results.</p>
     243""" + Tools.GitLogMessage()
    244244
    245245                def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
  • tests/concurrent/signal/disjoint.cfa

    r44b37de rd0da7ed  
    7777        wait( cond );
    7878        if( d.state != SIGNAL ) {
    79                 sout | "ERROR barging!";
     79                abort | "ERROR barging!";
    8080        }
    8181
     
    113113        bool running = TEST(globals.data.counter < N) && globals.data.counter > 0;
    114114        if( globals.data.state != SIGNAL && running ) {
    115                 sout | "ERROR Eager signal" | globals.data.state;
     115                abort | "ERROR Eager signal" | globals.data.state;
    116116        }
    117117}
Note: See TracChangeset for help on using the changeset viewer.