diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-09 16:45:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 16:45:54 +0000 |
| commit | 7c28ea7d807a4f4916fdb1a5875f58305ebb5647 (patch) | |
| tree | fd56ba11e96720d42727a7a92f84a706e50ed02d | |
| parent | 2f39cd09dd6d2f88440aef263f3d35c055fb4650 (diff) | |
| parent | 715bef760317ff4ab1400f3ce92305d739054047 (diff) | |
| download | bionic-7c28ea7d807a4f4916fdb1a5875f58305ebb5647.tar.gz | |
Merge "Use GTEST_SKIP() rather than GTEST_LOG_() when skipping." am: b74ddc301e am: 715bef7603
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1670435
Change-Id: I48b8c2cbd1ffdddebec4436b9f007138425f4579
| -rw-r--r-- | tests/setjmp_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/setjmp_test.cpp b/tests/setjmp_test.cpp index 4b1482ac6..ec1badcf2 100644 --- a/tests/setjmp_test.cpp +++ b/tests/setjmp_test.cpp @@ -321,6 +321,6 @@ TEST(setjmp, bug_152210274) { ASSERT_EQ(0, pthread_create(&t, nullptr, interrupter, tids)); pthread_join(t, nullptr); #else - GTEST_LOG_(INFO) << "tests uses functions not in glibc"; + GTEST_SKIP() << "tests uses functions not in glibc"; #endif } |