3126

4 files changed, 3 insertions, 16 deletions

diff --git a/050scenario.cc b/050scenario.cc
index b0388dc6..eec1bd84 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -692,10 +692,7 @@ case CHECK_TRACE_COUNT_FOR_LABEL: {
       // just testing scenario support
       raise << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end();
     }
-    if (!Scenario_testing_scenario) {
-      Passed = false;
-      ++Num_failures;
-    }
+    if (!Scenario_testing_scenario) Passed = false;
   }
   break;
 }
diff --git a/071scheduler.cc b/071scheduler.cc
index 3a5da648..d15a7bb6 100644
--- a/071scheduler.cc
+++ b/071scheduler.cc
@@ -477,13 +477,11 @@ if (Current_routine->limit >= 0) {
 if (Passed && any_routines_with_error()) {
   Passed = false;
   raise << "some routines died with errors\n" << end();
-  ++Num_failures;
 }
 :(before "End Mu Test Teardown")
 if (Passed && any_routines_with_error()) {
   Passed = false;
   raise << Current_scenario->name << ": some routines died with errors\n" << end();
-  ++Num_failures;
 }
 
 :(code)
diff --git a/072wait.cc b/072wait.cc
index 3f69219f..584e88e3 100644
--- a/072wait.cc
+++ b/072wait.cc
@@ -33,13 +33,11 @@ waiting_on_location = old_value_of_waiting_location = 0;
 if (Passed && any_routines_waiting()) {
   Passed = false;
   raise << Current_scenario->name << ": deadlock!\n" << end();
-  ++Num_failures;
 }
 :(before "End Test Teardown")
 if (Passed && any_routines_with_error()) {
   Passed = false;
   raise << "some routines died with errors\n" << end();
-  ++Num_failures;
 }
 :(code)
 bool any_routines_waiting() {
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index a3cf9393..e79f66cb 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -249,10 +249,7 @@ void check_screen(const string& expected_contents, const int color) {
           // just testing check_screen
           raise << "expected screen location (" << row << ", " << column << ") to be in color " << color << " instead of " << no_scientific(get_or_insert(Memory, addr+cell_color_offset)) << '\n' << end();
         }
-        if (!Scenario_testing_scenario) {
-          Passed = false;
-          ++Num_failures;
-        }
+        if (!Scenario_testing_scenario) Passed = false;
         return;
       }
 
@@ -280,10 +277,7 @@ void check_screen(const string& expected_contents, const int color) {
         // just testing check_screen
         raise << "expected screen location (" << row << ", " << column << ") to contain " << curr << expected_pretty << color_phrase.str() << " instead of " << no_scientific(get_or_insert(Memory, addr)) << actual_pretty << '\n' << end();
       }
-      if (!Scenario_testing_scenario) {
-        Passed = false;
-        ++Num_failures;
-      }
+      if (!Scenario_testing_scenario) Passed = false;
       return;
     }
     assert(cursor.get() == '.');