diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:18 +0000 |
| commit | c0de12404986565d2a7b66569af5e09ec604ffd9 (patch) | |
| tree | 007c6a23022007f52326b10a4843846b59800a00 /src/common/linux/elf_core_dump_unittest.cc | |
| parent | 05728773737deb58a10cdbe29750152c13e400bf (diff) | |
| parent | 5c069a8915093a3af6bb26639a4ac8aa0db2badb (diff) | |
| download | google-breakpad-c0de12404986565d2a7b66569af5e09ec604ffd9.tar.gz | |
Snap for 7474514 from 5c069a8915093a3af6bb26639a4ac8aa0db2badb to mainline-media-releaseandroid-mainline-12.0.0_r89android-mainline-12.0.0_r74android-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-release
Change-Id: Ib9813bef7c81bcd39b9788281fa7219d68f5891a
Diffstat (limited to 'src/common/linux/elf_core_dump_unittest.cc')
| -rw-r--r-- | src/common/linux/elf_core_dump_unittest.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/common/linux/elf_core_dump_unittest.cc b/src/common/linux/elf_core_dump_unittest.cc index 9b41dcee..2399c12f 100644 --- a/src/common/linux/elf_core_dump_unittest.cc +++ b/src/common/linux/elf_core_dump_unittest.cc @@ -244,9 +244,18 @@ TEST(ElfCoreDumpTest, ValidCoreFile) { note = note.GetNextNote(); } - EXPECT_TRUE(expected_thread_ids == actual_thread_ids); +#if defined(THREAD_SANITIZER) + for (std::set<pid_t>::const_iterator expected = expected_thread_ids.begin(); + expected != expected_thread_ids.end(); + ++expected) { + EXPECT_NE(actual_thread_ids.find(*expected), actual_thread_ids.end()); + } + EXPECT_GE(num_nt_prstatus, kNumOfThreads); +#else + EXPECT_EQ(actual_thread_ids, expected_thread_ids); + EXPECT_EQ(num_nt_prstatus, kNumOfThreads); +#endif EXPECT_EQ(1U, num_nt_prpsinfo); - EXPECT_EQ(kNumOfThreads, num_nt_prstatus); #if defined(__i386__) || defined(__x86_64__) EXPECT_EQ(num_pr_fpvalid, num_nt_fpregset); #endif |