Reviewers: Sven Panne,
Message:
PTAL
Description:
Fix platform unittests.
Follow-up to 87db4ff1f4d76eecb8f19d62f4c04279d56bf229, which added
suppressions to unittests.status and a special case for Android to the
ThreadLocalStorageTest, both of which are unneccessary and should be
handled differently for the GTest based unittests.
BUG=v8:3706
LOG=n
Please review this at https://codereview.chromium.org/757913002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+10, -15 lines):
M test/unittests/base/platform/platform-unittest.cc
M test/unittests/unittests.status
Index: test/unittests/base/platform/platform-unittest.cc
diff --git a/test/unittests/base/platform/platform-unittest.cc
b/test/unittests/base/platform/platform-unittest.cc
index
b972d8ab3e65123d451511c249fcb7c48d637ba4..b17a9b9ef49b6c0737b6480af52d2cee09ac86ed
100644
--- a/test/unittests/base/platform/platform-unittest.cc
+++ b/test/unittests/base/platform/platform-unittest.cc
@@ -13,6 +13,12 @@
#endif
#include "testing/gtest/include/gtest/gtest.h"
+#if V8_OS_ANDROID
+#define DISABLE_ON_ANDROID(Name) DISABLED_##Name
+#else
+#define DISABLE_ON_ANDROID(Name) Name
+#endif
+
namespace v8 {
namespace base {
@@ -33,13 +39,13 @@ namespace {
class SelfJoinThread FINAL : public Thread {
public:
SelfJoinThread() : Thread(Options("SelfJoinThread")) {}
- virtual void Run() OVERRIDE { Join(); }
+ void Run() FINAL { Join(); }
};
} // namespace
-TEST(Thread, SelfJoin) {
+TEST(Thread, DISABLE_ON_ANDROID(SelfJoin)) {
SelfJoinThread thread;
thread.Start();
thread.Join();
@@ -61,7 +67,7 @@ class ThreadLocalStorageTest : public Thread,
public ::testing::Test {
}
}
- virtual void Run() FINAL OVERRIDE {
+ void Run() FINAL {
for (size_t i = 0; i < arraysize(keys_); i++) {
CHECK(!Thread::HasThreadLocal(keys_[i]));
}
@@ -91,16 +97,12 @@ class ThreadLocalStorageTest : public Thread,
public ::testing::Test {
private:
static void* GetValue(size_t x) {
- return reinterpret_cast<void*>(static_cast<uintptr_t>(x + 1));
+ return bit_cast<void*>(static_cast<uintptr_t>(x + 1));
}
-#if defined(ANDROID)
// Older versions of Android have fewer TLS slots (nominally 64, but the
// system uses "about 5 of them" itself).
Thread::LocalStorageKey keys_[32];
-#else
- Thread::LocalStorageKey keys_[256];
-#endif
};
} // namespace
Index: test/unittests/unittests.status
diff --git a/test/unittests/unittests.status
b/test/unittests/unittests.status
index
021d38b140d21e0bfd050ca70f1ad5cf46418475..d439913ccf68a2b308920724a0651786bb0464da
100644
--- a/test/unittests/unittests.status
+++ b/test/unittests/unittests.status
@@ -3,11 +3,4 @@
# found in the LICENSE file.
[
-
-##############################################################################
-['arch == android_arm or arch == android_ia32', {
-
- # This test times out.
- 'Thread.SelfJoin': [SKIP],
-}], # 'arch == android_arm or arch == android_ia32'
]
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
