From e81da299fb49bd79cd460d477ec0bb673035620a Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 20 Jul 2016 18:05:56 -0700 Subject: 3117 --- html/050scenario.cc.html | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'html/050scenario.cc.html') diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index e8a8d028..213874ff 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -69,6 +69,7 @@ scenario foo [ 2 <- 13 ] ] +# checks are inside scenario :(scenario scenario_check_memory_and_trace) scenario foo [ @@ -86,6 +87,7 @@ scenario foo [ a: x y z ] ] +# checks are inside scenario //:: Core data structure @@ -257,7 +259,6 @@ Name[r]["__maybe_make_raw_test__"] = Res def scenario-foo [ 1:number <- copy 34 ] - def scenario-foo [ 1:number <- copy 35 ] @@ -540,7 +541,7 @@ def main [ a: d ] ] -+error: missing [b] in trace with label a ++error: missing [b] in trace with label 'a' :(before "End Primitive Recipe Declarations") TRACE_SHOULD_CONTAIN, @@ -573,8 +574,14 @@ put(Recipe_ordinal,if (curr_expected_line == SIZE(expected_lines)) return; } - raise << "missing [" << expected_lines.at(curr_expected_line).contents << "] " - << "in trace with label " << expected_lines.at(curr_expected_line).label << '\n' << end(); + if (Current_scenario && !Scenario_testing_scenario) + raise << "\nF - " << Current_scenario->name << ": missing [" << expected_lines.at(curr_expected_line).contents << "] " + << "in trace with label '" << expected_lines.at(curr_expected_line).label << "'\n" << end(); + else + raise << "missing [" << expected_lines.at(curr_expected_line).contents << "] " + << "in trace with label '" << expected_lines.at(curr_expected_line).label << "'\n" << end(); + if (!Hide_errors) + DUMP(expected_lines.at(curr_expected_line).label); Passed = false; } @@ -602,7 +609,7 @@ def main [ a: d ] ] -+error: missing [d] in trace with label a ++error: missing [d] in trace with label 'a' :(scenario trace_check_passes_silently) % Scenario_testing_scenario = true; @@ -614,7 +621,7 @@ def main [ a: b ] ] --error: missing [b] in trace with label a +-error: missing [b] in trace with label 'a' $error: 0 //: 'trace-should-not-contain' is like the '-' lines in our scenarios so far @@ -632,7 +639,7 @@ def main [ a: b ] ] -+error: unexpected [b] in trace with label a ++error: unexpected [b] in trace with label 'a' :(before "End Primitive Recipe Declarations") TRACE_SHOULD_NOT_CONTAIN, @@ -657,7 +664,7 @@ put(Recipe_ordinal,(in); for (int i = 0; i < SIZE(lines); ++i) { if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) { - raise << "unexpected [" << lines.at(i).contents << "] in trace with label " << lines.at(i).label << '\n' << end(); + raise << "unexpected [" << lines.at(i).contents << "] in trace with label '" << lines.at(i).label << "'\n" << end(); Passed = false; return false; } @@ -672,7 +679,7 @@ def main [ a: b ] ] --error: unexpected [b] in trace with label a +-error: unexpected [b] in trace with label 'a' $error: 0 :(scenario trace_negative_check_fails_on_any_unexpected_line) @@ -687,7 +694,7 @@ def main [ a: d ] ] -+error: unexpected [d] in trace with label a ++error: unexpected [d] in trace with label 'a' :(scenario trace_count_check) def main [ @@ -696,6 +703,7 @@ def main [ ] check-trace-count-for-label 1, [a] ] +# checks are inside scenario :(before "End Primitive Recipe Declarations") CHECK_TRACE_COUNT_FOR_LABEL, @@ -726,12 +734,12 @@ put(Recipe_ordinal,if (count != expected_count) { if (Current_scenario && !Scenario_testing_scenario) { // genuine test in a mu file - raise << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace: " << end(); + raise << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace: " << end(); DUMP(label); } else { // just testing scenario support - raise << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace\n" << end(); + raise << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label '" << label << "' in trace\n" << end(); } if (!Scenario_testing_scenario) { Passed = false; @@ -750,7 +758,7 @@ def main [ ] check-trace-count-for-label 2, [a] ] -+error: main: expected 2 lines in trace with label a in trace ++error: main: expected 2 lines in trace with label 'a' in trace //: Minor detail: ignore 'system' calls in scenarios, since anything we do //: with them is by definition impossible to test through mu. -- cgit 1.4.1-2-gfad0