From 2e1f630f234dc31e3d1053cc346fbed7302ad7fb Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Wed, 20 Jul 2016 13:06:28 -0700
Subject: 3115

Fix CI.
---
 050scenario.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/050scenario.cc b/050scenario.cc
index 4ccef4a8..c9f9d101 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -504,7 +504,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,
@@ -572,7 +572,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;
@@ -584,7 +584,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
@@ -602,7 +602,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,
@@ -627,7 +627,7 @@ bool check_trace_missing(const string& in) {
   vector<trace_line> lines = parse_trace(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;
     }
@@ -642,7 +642,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)
@@ -657,7 +657,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 [
@@ -697,12 +697,12 @@ case CHECK_TRACE_COUNT_FOR_LABEL: {
   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;
@@ -721,7 +721,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

='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
</pre></td>
<td class='lines'><pre><code>