Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 312be3d

Browse files
committed
Mark tls death test properly.
Avoid tombstones being created for tls death test by inheriting from the silent death test. Test: Ran normal and static bionic unit tests and observed no tombstones. Change-Id: I4d825a8bbd8625caa0f1b56fa0e80dcf67c4e746
1 parent d1d4e8b commit 312be3d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tests/static_tls_layout_test.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
#include <gtest/gtest.h>
3737

38+
#include <android-base/silent_death_test.h>
39+
3840
#include "private/bionic_tls.h"
3941

4042
using namespace std::string_literals;
@@ -138,7 +140,9 @@ static size_t operator""_words(unsigned long long i) {
138140
return i * sizeof(void*);
139141
}
140142

141-
TEST(static_tls_layout, arm) {
143+
using static_tls_layout_DeathTest = SilentDeathTest;
144+
145+
TEST_F(static_tls_layout_DeathTest, arm) {
142146
#if !defined(__arm__) && !defined(__aarch64__)
143147
GTEST_SKIP() << "test only applies to arm32/arm64 targets";
144148
#endif

0 commit comments

Comments
 (0)