Changeset e99e43f for tests/concurrent/waitfor/dtor.cfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• tests/concurrent/waitfor/dtor.cfa (moved) (moved from tests/concurrent/waitfor/dtor.c ) (3 diffs)

tests/concurrent/waitfor/dtor.cfa

@@ -29 +29 @@
         switch(state) {
                 case CTOR  : break;
-                case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR"  | endl; abort(); } this.state = state; break;
-                case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN"  | endl; abort(); } this.state = state; break;
-                case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER" | endl; abort(); } this.state = state; break;
-                case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"   | endl; abort(); } this.state = state; break;
+                case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR" ; abort(); } this.state = state; break;
+                case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN" ; abort(); } this.state = state; break;
+                case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER"; abort(); } this.state = state; break;
+                case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"  ; abort(); } this.state = state; break;
         }
 }
@@ -54 +54 @@
 
 int main() {
-        sout | "Starting" | endl;
+        sout | "Starting";
         processor p;
         for( int i = 0; i < N; i++ ){
@@ -60 +60 @@
                 yield( random( 100 ) );
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping";
 }