diff options
| author | Tao Bao <tbao@google.com> | 2018-06-06 08:21:32 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-06 08:21:32 +0200 |
| commit | d770790a8f3af4b8eb6e86aab225393d128ec043 (patch) | |
| tree | 4cd4048bcf55c08a212e3697cbb5b6e5542c367d | |
| parent | Merge "updater_sample: Add UI docs to README" (diff) | |
| parent | Merge "tests: Specify the death test style to avoid flakiness." (diff) | |
| download | android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar.gz android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar.bz2 android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar.lz android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar.xz android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.tar.zst android_bootable_recovery-d770790a8f3af4b8eb6e86aab225393d128ec043.zip | |
| -rw-r--r-- | tests/unit/rangeset_test.cpp | 3 | ||||
| -rw-r--r-- | tests/unit/screen_ui_test.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/unit/rangeset_test.cpp b/tests/unit/rangeset_test.cpp index 7ae193e18..fc72f2f6d 100644 --- a/tests/unit/rangeset_test.cpp +++ b/tests/unit/rangeset_test.cpp @@ -209,6 +209,7 @@ TEST(RangeSetTest, GetBlockNumber) { ASSERT_EQ(static_cast<size_t>(6), rs.GetBlockNumber(5)); ASSERT_EQ(static_cast<size_t>(9), rs.GetBlockNumber(8)); + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; // Out of bound. ASSERT_EXIT(rs.GetBlockNumber(9), ::testing::KilledBySignal(SIGABRT), ""); } @@ -284,6 +285,8 @@ TEST(SortedRangeSetTest, file_range) { ASSERT_EQ(static_cast<size_t>(10), rs.GetOffsetInRangeSet(4106)); ASSERT_EQ(static_cast<size_t>(40970), rs.GetOffsetInRangeSet(4096 * 16 + 10)); + + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; // block#10 not in range. ASSERT_EXIT(rs.GetOffsetInRangeSet(40970), ::testing::KilledBySignal(SIGABRT), ""); } diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp index 25623074c..2179b729f 100644 --- a/tests/unit/screen_ui_test.cpp +++ b/tests/unit/screen_ui_test.cpp @@ -408,5 +408,7 @@ TEST_F(ScreenRecoveryUITest, LoadAnimation_MissingAnimation) { ASSERT_TRUE(ui_->Init(kTestLocale)); TemporaryDir resource_dir; Paths::Get().set_resource_dir(resource_dir.path); + + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), ""); } |