Ignore:
Timestamp:
Jun 29, 2021, 5:35:19 PM (4 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
dcad80a
Parents:
5a46e09 (diff), d02e547 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/concurrent/signal/disjoint.cfa

    r5a46e09 r660665f  
    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.