diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2015-05-12 08:47:06 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2015-05-12 08:47:06 -0700 |
| commit | 54e4548dd1695c94f580302b637fe427be995c2a (patch) | |
| tree | 66ea8622eead90b1373cbf8bfaf5f01c5d829011 | |
| parent | 66083e54a0a122e0b9f396ee32ee632065ecbb66 (diff) | |
| download | mu-54e4548dd1695c94f580302b637fe427be995c2a.tar.gz | |
1354
| -rw-r--r-- | 002test.cc | 4 | ||||
| -rw-r--r-- | 003trace.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/002test.cc b/002test.cc index 72f083bb..0b445526 100644 --- a/002test.cc +++ b/002test.cc @@ -23,7 +23,7 @@ long Num_failures = 0; #define CHECK(X) \ if (!(X)) { \ ++Num_failures; \ - cerr << "\nF " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << '\n'; \ + cerr << "\nF - " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << '\n'; \ Passed = false; \ return; /* Currently we stop at the very first failure. */ \ } @@ -31,7 +31,7 @@ long Num_failures = 0; #define CHECK_EQ(X, Y) \ if ((X) != (Y)) { \ ++Num_failures; \ - cerr << "\nF " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << " == " << #Y << '\n'; \ + cerr << "\nF - " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << " == " << #Y << '\n'; \ cerr << " got " << (X) << '\n'; /* BEWARE: multiple eval */ \ Passed = false; \ return; /* Currently we stop at the very first failure. */ \ diff --git a/003trace.cc b/003trace.cc index 04e0b9c7..6fb6dfa7 100644 --- a/003trace.cc +++ b/003trace.cc @@ -240,7 +240,7 @@ bool check_trace_contents(string FUNCTION, string FILE, int LINE, string expecte } ++Num_failures; - cerr << "\nF " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << contents << "] in trace:\n"; + cerr << "\nF - " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << contents << "] in trace:\n"; DUMP(layer); Passed = false; return false; @@ -299,7 +299,7 @@ bool check_trace_contents(string FUNCTION, string FILE, int LINE, string layer, } ++Num_failures; - cerr << "\nF " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << expected_lines.at(curr_expected_line) << "] in trace:\n"; + cerr << "\nF - " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << expected_lines.at(curr_expected_line) << "] in trace:\n"; DUMP(layer); Passed = false; return false; @@ -339,7 +339,7 @@ int trace_count(string layer, int frame, string line) { #define CHECK_TRACE_DOESNT_WARN() \ if (trace_count("warn") > 0) { \ ++Num_failures; \ - cerr << "\nF " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): unexpected warnings\n"; \ + cerr << "\nF - " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): unexpected warnings\n"; \ DUMP("warn"); \ Passed = false; \ return; \ @@ -400,7 +400,7 @@ bool check_trace_contents(string FUNCTION, string FILE, int LINE, string layer, } ++Num_failures; - cerr << "\nF " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << expected_lines.at(curr_expected_line) << "] in trace/" << frame << ":\n"; + cerr << "\nF - " << FUNCTION << "(" << FILE << ":" << LINE << "): missing [" << expected_lines.at(curr_expected_line) << "] in trace/" << frame << ":\n"; DUMP(layer); Passed = false; return false; |