commit c561d0abbb91bed88514927ac62750babfd5018f
author Daniel.L (Byoungchan Lee) <daniel.l@hpcnt.com> Thu Dec 16 09:56:38 2021 +0900
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Dec 20 13:21:11 2021 +0000
tree ddee9e2ec094a93d79d41d610be88163b341cd1d
parent 9e48751f0df38f59865a6c3f728804b7719cdb6d

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}

sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc

diff --git a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
index 1dc9bee..b77d867 100644
--- a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
+++ b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
@@ -224,25 +224,11 @@
       << "] 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 @@
 // 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>());
 }