Reduce flake in pthread mutex timed lock tests.
Given that the POSIX APIs use absolute times rather than relative times, we need to allow for some variance. 0.01s is traditional in our tests.
Also break the pthread_mutex_clocklock test in two, so it's obvious from a gtest failure which clock was in use (since gtest doesn't give you stack traces, and the actual testing is done in a helper function).
Bug: http://b/376769706
Change-Id: I264e4d0fccb606cf9fde24a1f6da52a51b8a8f68
diff --git a/tests/sys_time_test.cpp b/tests/sys_time_test.cpp
index ff9271f..b0e52aa 100644
--- a/tests/sys_time_test.cpp
+++ b/tests/sys_time_test.cpp
@@ -23,6 +23,7 @@
#include <android-base/file.h>
+#include "private/bionic_time_conversions.h"
#include "utils.h"
// http://b/11383777
@@ -147,14 +148,6 @@
ASSERT_EQ(0, syscall(__NR_gettimeofday, &tv2, nullptr));
// What's the difference between the two?
- tv2.tv_sec -= tv1.tv_sec;
- tv2.tv_usec -= tv1.tv_usec;
- if (tv2.tv_usec < 0) {
- --tv2.tv_sec;
- tv2.tv_usec += 1000000;
- }
-
// To try to avoid flakiness we'll accept answers within 10,000us (0.01s).
- ASSERT_EQ(0, tv2.tv_sec);
- ASSERT_LT(tv2.tv_usec, 10'000);
+ ASSERT_LT(to_us(tv2) - to_us(tv1), 10'000);
}