Re-enable Stacktrace Unittest on Android

After changing the way libunwind is built in https://crrev.com/c/3297439,
this test should work fine.

Bug: webrtc:13383
Change-Id: I5da7bf27ce3041c934d4ab91367a26c076fac0c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/241700
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Commit-Queue: Xavier Lepaul‎ <xalep@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35558}
This commit is contained in:
Daniel.L (Byoungchan Lee)
2021-12-16 09:56:38 +09:00
committed by WebRTC LUCI CQ
parent 9e48751f0d
commit c561d0abbb

View File

@ -224,25 +224,11 @@ TEST(Stacktrace, TestCurrentThread) {
<< "] not contained in: " << StackTraceToString(stack_trace);
}
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
#ifdef WEBRTC_ARCH_ARM64
#define MAYBE_TestSpinLock DISABLED_TestSpinLock
#else
#define MAYBE_TestSpinLock TestSpinLock
#endif
TEST(Stacktrace, MAYBE_TestSpinLock) {
TEST(Stacktrace, TestSpinLock) {
TestStacktrace(std::make_unique<SpinDeadlock>());
}
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
#ifdef WEBRTC_ARCH_ARM64
#define MAYBE_TestSleep DISABLED_TestSleep
#else
#define MAYBE_TestSleep TestSleep
#endif
TEST(Stacktrace, MAYBE_TestSleep) {
TEST(Stacktrace, TestSleep) {
TestStacktrace(std::make_unique<SleepDeadlock>());
}
@ -250,15 +236,11 @@ TEST(Stacktrace, MAYBE_TestSleep) {
// traces for ARM 32.
#ifdef WEBRTC_ARCH_ARM64
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
TEST(Stacktrace, DISABLED_TestRtcEvent) {
TEST(Stacktrace, TestRtcEvent) {
TestStacktrace(std::make_unique<RtcEventDeadlock>());
}
// TODO(bugs.webrtc.org/13383): Re-enable once stack unwinding with
// compiler-rt/libunwind works on Android arm64.
TEST(Stacktrace, DISABLED_TestRtcCriticalSection) {
TEST(Stacktrace, TestRtcCriticalSection) {
TestStacktrace(std::make_unique<RtcCriticalSectionDeadlock>());
}