aboutsummaryrefslogtreecommitdiffstats
path: root/vespalib/src
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@gmail.com>2016-08-29 14:04:10 +0200
committerGitHub <noreply@github.com>2016-08-29 14:04:10 +0200
commit1eeefb542c89f36a010cb8006ee36abcb871ba06 (patch)
tree3b03bfc19e6114ddd45f19e99e5bd7434161d776 /vespalib/src
parentd5e2aa89bfbfea22a42cb046bebba6ebc8a61950 (diff)
parent00fca14865a69897a157fee535c52874fa12d8a2 (diff)
Merge pull request #494 from yahoo/aressem/make-testkit-output-make-compatible-error-messages
Reformat error messages on fail tests so that they are picked up by a…
Diffstat (limited to 'vespalib/src')
-rw-r--r--vespalib/src/vespa/vespalib/testkit/test_master.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.cpp b/vespalib/src/vespa/vespalib/testkit/test_master.cpp
index 28574358326..60fde106a27 100644
--- a/vespalib/src/vespa/vespalib/testkit/test_master.cpp
+++ b/vespalib/src/vespa/vespalib/testkit/test_master.cpp
@@ -58,8 +58,8 @@ TestMaster::checkFailed(const vespalib::LockGuard &guard,
ThreadState &thread = threadState(guard);
++thread.failCnt;
++_state.failCnt;
- fprintf(stderr, "%s: ERROR: check failure #%zu: '%s' in thread '%s' (%s:%d)\n",
- _name.c_str(), _state.failCnt, str, thread.name.c_str(), skip_path(file), line);
+ fprintf(stderr, "%s:%d: error: check failure #%zu: '%s' in thread '%s' (%s)\n",
+ skip_path(file), line, _state.failCnt, str, thread.name.c_str(), _name.c_str());
if (!thread.traceStack.empty()) {
for (size_t i = thread.traceStack.size(); i-- > 0; ) {
const TraceItem &item = thread.traceStack[i];