aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2019-09-24 19:19:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-09-24 19:19:28 +0000
commitf97dcc15e86dc557517a9b767bc1f6d22ad66594 (patch)
treecce0515de4ea0ec9ac44f0977c26cb9fb734dfae
parent849f0db7cacb598821fd6bd87de7806928990ba5 (diff)
parenta9dfe1c3521776dab85edbec16e4cee60192c8aa (diff)
downloadbionic-f97dcc15e86dc557517a9b767bc1f6d22ad66594.tar.gz
Merge "Revert "Temporarily disable some clock_getres tests.""
-rw-r--r--tests/time_test.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 51adf130b..4e1724211 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -708,10 +708,6 @@ TEST(time, clock_gettime_unknown) {
}
TEST(time, clock_getres_CLOCK_REALTIME) {
-#if defined(__i386__)
- // See b/141515847
- GTEST_SKIP() << "Temporary disable until cuttlefish kernel is fixed.";
-#endif
timespec ts;
ASSERT_EQ(0, clock_getres(CLOCK_REALTIME, &ts));
ASSERT_EQ(1, ts.tv_nsec);
@@ -719,10 +715,6 @@ TEST(time, clock_getres_CLOCK_REALTIME) {
}
TEST(time, clock_getres_CLOCK_MONOTONIC) {
-#if defined(__i386__)
- // See b/141515847
- GTEST_SKIP() << "Temporary disable until cuttlefish kernel is fixed.";
-#endif
timespec ts;
ASSERT_EQ(0, clock_getres(CLOCK_MONOTONIC, &ts));
ASSERT_EQ(1, ts.tv_nsec);
@@ -740,10 +732,6 @@ TEST(time, clock_getres_CLOCK_THREAD_CPUTIME_ID) {
}
TEST(time, clock_getres_CLOCK_BOOTTIME) {
-#if defined(__i386__)
- // See b/141515847
- GTEST_SKIP() << "Temporary disable until cuttlefish kernel is fixed.";
-#endif
timespec ts;
ASSERT_EQ(0, clock_getres(CLOCK_BOOTTIME, &ts));
ASSERT_EQ(1, ts.tv_nsec);