summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-07-20 21:07:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-20 21:07:42 +0000
commitbf87d554e7fc9ace4627d4f25a9588f9b6a59642 (patch)
tree982d3d7b0714a6364957d4f26f1483a3a06a06f9
parenta747463c6cb4bb62568b01b0b0615a566c442b25 (diff)
parente184f2be4dfd4c1d425f30c71538acf4d30e553f (diff)
downloadgtest_extras-bf87d554e7fc9ace4627d4f25a9588f9b6a59642.tar.gz
Adds a \n between "Skipped" and message. am: 8b01e5b60b am: e184f2be4d
Original change: https://android-review.googlesource.com/c/platform/system/testing/gtest_extras/+/1363737 Change-Id: Ib3dc55821c5f6a642d53abdec210429f68bf69fd
-rw-r--r--Isolate.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Isolate.cpp b/Isolate.cpp
index 6ed4cb4..8f76f54 100644
--- a/Isolate.cpp
+++ b/Isolate.cpp
@@ -653,7 +653,10 @@ void TestResultPrinter::OnTestPartResult(const ::testing::TestPartResult& result
}
if (result.type() == ::testing::TestPartResult::kSkip) {
- printf("%s:(%d) Skipped%s\n", result.file_name(), result.line_number(), result.message());
+ printf("%s:(%d) Skipped\n", result.file_name(), result.line_number());
+ if (*result.message()) {
+ printf("%s\n", result.message());
+ }
} else {
// Print failure message from the assertion (e.g. expected this and got that).
printf("%s:(%d) Failure in test %s.%s\n%s\n", result.file_name(), result.line_number(),