Changeset cde3891 for tests/concurrent/signal/block.cfa

Timestamp:

Jan 23, 2019, 4:52:16 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a200795

Parents:

9b086ca (diff), 1d832f4 (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' into cleanup-dtors

File:

• tests/concurrent/signal/block.cfa (moved) (moved from tests/concurrent/signal/block.c ) (6 diffs)

tests/concurrent/signal/block.cfa

@@ -8 +8 @@
 
 #include <fstream.hfa>
-#include <kernel.hfa>hfa>
+#include <kernel.hfa>
 #include <monitor.hfa>
 #include <stdlib.hfa>
@@ -14 +14 @@
 #include <time.hfa>
 
-#include "long_tests.h"
+#include "long_tests.hfa"
 
 #ifndef PREEMPTION_RATE
@@ -57 +57 @@
 
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
-                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread | endl;
+                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread;
                 abort();
         }
@@ -85 +85 @@
 
                 if( ! signal_block( cond ) ) {
-                        sout | "ERROR expected to be able to signal" | endl;
+                        sout | "ERROR expected to be able to signal";
                         abort();
                 }
@@ -92 +92 @@
 
                 if(a.last_thread != next || b.last_thread != next) {
-                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread | endl;
+                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread;
                         abort();
                 }
@@ -130 +130 @@
                 Signaller s[4];
                 Barger b[13];
-                sout | "Starting waiters" | endl;
+                sout | "Starting waiters";
                 {
                         Waiter w[3];
                 }
-                sout | "Waiters done" | endl;
+                sout | "Waiters done";
                 done = true;
         }