diff options
Diffstat (limited to 'cpp/050scenario')
-rw-r--r-- | cpp/050scenario | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/cpp/050scenario b/cpp/050scenario index 9b5b74bb..247bb0c1 100644 --- a/cpp/050scenario +++ b/cpp/050scenario @@ -17,33 +17,33 @@ vector<scenario> Scenarios; :(before "End Tests") time_t mu_time; time(&mu_time); cerr << "\nMu tests: " << ctime(&mu_time); -run_mu_tests(); +for (size_t i = 0; i < Scenarios.size(); ++i) { + run_mu_test(i); +} :(code) -void run_mu_tests() { - for (size_t i = 0; i < Scenarios.size(); ++i) { - setup(); - Trace_file = Scenarios[i].name; - START_TRACING_UNTIL_END_OF_SCOPE - if (!Scenarios[i].dump_layer.empty()) - Trace_stream->dump_layer = Scenarios[i].dump_layer; -//? cerr << "AAA " << Scenarios[i].name << '\n'; //? 1 -//? cout << Scenarios[i].to_run; //? 2 - run(Scenarios[i].to_run); -//? cout << "after: " << Memory[1] << '\n'; //? 1 -//? cout << "After:\n"; dump_memory(); //? 1 - for (map<int, int>::iterator p = Scenarios[i].memory_expectations.begin(); - p != Scenarios[i].memory_expectations.end(); - ++p) { - if (Memory[p->first] != p->second) { - // todo: unit tests for the test parsing infrastructure; use raise? - cerr << Scenarios[i].name << ": Expected location " << p->first << " to contain " << p->second << " but saw " << Memory[p->first] << '\n'; - Passed = false; - } +void run_mu_test(size_t i) { + setup(); + Trace_file = Scenarios[i].name; + START_TRACING_UNTIL_END_OF_SCOPE + if (!Scenarios[i].dump_layer.empty()) + Trace_stream->dump_layer = Scenarios[i].dump_layer; +//? cerr << "AAA " << Scenarios[i].name << '\n'; //? 1 +//? cout << Scenarios[i].to_run; //? 2 + run(Scenarios[i].to_run); +//? cout << "after: " << Memory[1] << '\n'; //? 1 +//? cout << "after:\n"; dump_memory(); //? 1 + for (map<int, int>::iterator p = Scenarios[i].memory_expectations.begin(); + p != Scenarios[i].memory_expectations.end(); + ++p) { + if (Memory[p->first] != p->second) { + // todo: unit tests for the test parsing infrastructure; use raise? + cerr << Scenarios[i].name << ": Expected location " << p->first << " to contain " << p->second << " but saw " << Memory[p->first] << '\n'; + Passed = false; } - // End Scenario Checks - if (Passed) cerr << "."; } + // End Scenario Checks + if (Passed) cerr << "."; } //:: How we create Scenarios. |