3530

Coalesce some duplicate signalling that the current test failed.

3 files changed, 5 insertions, 13 deletions

diff --git a/050scenario.cc b/050scenario.cc
index cb16482d..7f3178c9 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -178,9 +178,9 @@ void run_mu_scenario(const scenario& s) {
   bind_special_scenario_names(tmp.at(0));
   transform_all();
   run(tmp.front());
+  // End Mu Test Teardown
   if (!Hide_errors && trace_count("error") > 0)
     Passed = false;
-  // End Mu Test Teardown
   if (!Passed)
     ++Num_failures;
   if (not_already_inside_test && Trace_stream) {
diff --git a/072scheduler.cc b/072scheduler.cc
index 38f62fa0..e027b9dc 100644
--- a/072scheduler.cc
+++ b/072scheduler.cc
@@ -545,15 +545,11 @@ if (Current_routine->limit >= 0) {
 }
 
 :(before "End Test Teardown")
-if (Passed && any_routines_with_error()) {
-  Passed = false;
+if (Passed && any_routines_with_error())
   raise << "some routines died with errors\n" << end();
-}
 :(before "End Mu Test Teardown")
-if (Passed && any_routines_with_error()) {
-  Passed = false;
+if (Passed && any_routines_with_error())
   raise << Current_scenario->name << ": some routines died with errors\n" << end();
-}
 
 :(code)
 bool any_routines_with_error() {
diff --git a/073wait.cc b/073wait.cc
index cf584d69..1290b561 100644
--- a/073wait.cc
+++ b/073wait.cc
@@ -33,20 +33,16 @@ int waiting_on_location;
 waiting_on_location = 0;
 
 :(before "End Mu Test Teardown")
-if (Passed && any_routines_waiting()) {
-  Passed = false;
+if (Passed && any_routines_waiting())
   raise << Current_scenario->name << ": deadlock!\n" << end();
-}
 :(before "End Run Routine")
 if (any_routines_waiting()) {
   raise << "deadlock!\n" << end();
   dump_waiting_routines();
 }
 :(before "End Test Teardown")
-if (Passed && any_routines_with_error()) {
-  Passed = false;
+if (Passed && any_routines_with_error())
   raise << "some routines died with errors\n" << end();
-}
 :(code)
 bool any_routines_waiting() {
   for (int i = 0;  i < SIZE(Routines);  ++i) {