diff options
| author | Arpit Singh <arpitks@google.com> | 2023-11-29 15:42:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-29 15:42:21 +0000 |
| commit | ff55512de9d805f920ecbc87742f1887e53b4ac6 (patch) | |
| tree | b7f6e233663ea100ce0500d016ac069c9e8acce6 | |
| parent | 0b441768e81376555ffaa9058ec8320dbbde212a (diff) | |
| parent | dfd29888e9d6a36637c39a00d072fd65a7c63a56 (diff) | |
| download | libchrome-gestures-ff55512de9d805f920ecbc87742f1887e53b4ac6.tar.gz | |
Revert "Disable parts of two gesturelib tests to prevent hwasan crash" am: dd1cf6611b am: dfd29888e9
Original change: https://android-review.googlesource.com/c/platform/external/libchrome-gestures/+/2837875
Change-Id: I2b18dcbdb6111dcb5f9fa72526d02e380a87a49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/activity_log_unittest.cc | 5 | ||||
| -rw-r--r-- | src/gestures_unittest.cc | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/activity_log_unittest.cc b/src/activity_log_unittest.cc index a5890e0..36dd6c0 100644 --- a/src/activity_log_unittest.cc +++ b/src/activity_log_unittest.cc @@ -131,10 +131,6 @@ TEST(ActivityLogTest, SimpleTest) { TEST(ActivityLogTest, WrapAroundTest) { ActivityLog log(nullptr); -#ifndef __ANDROID__ - // Disabling this test with DISABLED_ prefix is not sufficient as just by compiling this - // section causes the hwasan crash at runtime in some other tests - // TODO(b/311110623): re-enable this section once we've tracked down the hwasan crash // overfill the buffer const size_t fill_size = (ActivityLog::kBufferSize * 3) / 2; for (size_t i = 0; i < fill_size; i++) @@ -144,7 +140,6 @@ TEST(ActivityLogTest, WrapAroundTest) { log.LogCallbackRequest(static_cast<stime_t>(fill_size)); string second_prefix = log.Encode().substr(0, prefix_length); EXPECT_NE(first_prefix, second_prefix); -#endif } TEST(ActivityLogTest, VersionTest) { diff --git a/src/gestures_unittest.cc b/src/gestures_unittest.cc index af3dc9c..6b00902 100644 --- a/src/gestures_unittest.cc +++ b/src/gestures_unittest.cc @@ -342,15 +342,12 @@ TEST(GesturesTest, SimpleTest) { gs_ptr->Initialize(GESTURES_DEVCLASS_POINTING_STICK); DeleteGestureInterpreter(gs_ptr); -#ifndef __ANDROID__ - // TODO(b/311110623): re-enable this section once we've tracked down the hwasan crash gs_ptr = NewGestureInterpreter(); EXPECT_NE(nullptr, gs_ptr); gs_ptr->Initialize(GESTURES_DEVCLASS_MULTITOUCH_MOUSE); std::string activity = gs_ptr->EncodeActivityLog(); EXPECT_NE(activity.size(), 0); DeleteGestureInterpreter(gs_ptr); -#endif EXPECT_EQ("1073741824", FingerState::FlagsString(1 << 30)); } |