Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: test/unittests/base/platform/platform-unittest.cc

Issue 735863003: Fix/suppress unittests broken on Android (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/cctest/test-mark-compact.cc ('k') | test/unittests/unittests.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 06fbee004227b84ecfbe717bf45bea7f4c66e6be..b972d8ab3e65123d451511c249fcb7c48d637ba4 100644
--- a/test/unittests/base/platform/platform-unittest.cc
+++ b/test/unittests/base/platform/platform-unittest.cc
@@ -94,7 +94,13 @@ class ThreadLocalStorageTest : public Thread, public ::testing::Test {
return reinterpret_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
« no previous file with comments | « test/cctest/test-mark-compact.cc ('k') | test/unittests/unittests.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698