diff options
| -rw-r--r-- | 003trace.cc | 7 | ||||
| -rw-r--r-- | 003trace.test.cc | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/003trace.cc b/003trace.cc index b8c1c737..97a00b1c 100644 --- a/003trace.cc +++ b/003trace.cc @@ -265,9 +265,12 @@ int trace_count(string layer, string line) { Trace_stream->newline(); long result = 0; for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { - if (layer == p->label) - if (line == "" || line == p->contents) + if (layer == p->label) { +//? cerr << "a: " << line << "$\n"; //? 1 +//? cerr << "b: " << trim(p->contents) << "$\n"; //? 1 + if (line == "" || line == trim(p->contents)) ++result; + } } return result; } diff --git a/003trace.test.cc b/003trace.test.cc index 91b495a1..146f9dc2 100644 --- a/003trace.test.cc +++ b/003trace.test.cc @@ -51,6 +51,11 @@ void test_trace_supports_count2() { CHECK_EQ(trace_count("test layer 1"), 2); } +void test_trace_count_ignores_trailing_whitespace() { + trace("test layer 1") << "foo\n"; + CHECK(trace_count("test layer 1", "foo") == 1); +} + // pending: DUMP tests // pending: readable_contents() adds newline if necessary. // pending: raise also prints to stderr. |