diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-10-20 20:19:29 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-10-20 20:19:29 -0700 |
commit | dddc384c5124febdf111730fa760dcb6a06e7155 (patch) | |
tree | 239f1a3efbf773adabd3951439c84660b93ecfd2 /082scenario_screen.cc | |
parent | 2ada05dc69e930d096d8d6773d3191d2befe253a (diff) | |
download | mu-dddc384c5124febdf111730fa760dcb6a06e7155.tar.gz |
3531
Be consistent in checking for Scenario_testing_scenario when signalling that a Mu scenario failed.
Diffstat (limited to '082scenario_screen.cc')
-rw-r--r-- | 082scenario_screen.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/082scenario_screen.cc b/082scenario_screen.cc index c6862f9b..73660fb5 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -267,7 +267,7 @@ void check_screen(const string& expected_contents, const int color) { if (cursor.at_end()) break; if (cursor.get() != '.') { raise << Current_scenario->name << ": each row of the expected screen should start with a '.'\n" << end(); - Passed = false; + if (!Scenario_testing_scenario) Passed = false; return; } for (int column = 0; column < screen_width; ++column, addr+= /*size of screen-cell*/2) { @@ -323,7 +323,7 @@ void check_screen(const string& expected_contents, const int color) { } if (cursor.get() != '.') { raise << Current_scenario->name << ": row " << row << " of the expected screen is too long\n" << end(); - Passed = false; + if (!Scenario_testing_scenario) Passed = false; return; } } |