Backed out changeset 38a50c61c285 (bug 931062) for compilation failures on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Fri, 01 Nov 2013 14:23:37 +0000
changeset 153055 e30094c627832d624fd9ed3286f2e61829cd4fef
parent 153054 e4cccf4390c627972ff57fb139a0774d4b05ebd3
child 153056 72ccfc17138284907acd9ab4c86e78f616f62cfc
push id25566
push userryanvm@gmail.com
push dateFri, 01 Nov 2013 18:40:05 +0000
treeherdermozilla-central@5bb07c1ae9f5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs931062
milestone28.0a1
backs out38a50c61c285dc932512dd80f1bf6d2049488b2e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 38a50c61c285 (bug 931062) for compilation failures on a CLOSED TREE
xpcom/tests/TestPLDHash.cpp
--- a/xpcom/tests/TestPLDHash.cpp
+++ b/xpcom/tests/TestPLDHash.cpp
@@ -13,17 +13,18 @@
 // which are unlikely to be hit during normal execution.
 
 namespace TestPLDHash {
 
 static bool test_pldhash_Init_capacity_ok()
 {
   // Try the largest allowed capacity.  With PL_DHASH_MAX_SIZE==1<<26, this
   // will allocate 0.5GB of entry store on 32-bit platforms and 1GB on 64-bit
-  // platforms.
+  // platforms.  Hopefully that's not too much for the test machines to handle
+  // reliably.
   PLDHashTable t;
   bool ok = PL_DHashTableInit(&t, PL_DHashGetStubOps(), nullptr,
                               sizeof(PLDHashEntryStub), PL_DHASH_MAX_SIZE);
   if (ok)
     PL_DHashTableFinish(&t);
 
   return ok;
 }
@@ -108,20 +109,17 @@ typedef bool (*TestFunc)();
 
 static const struct Test {
   const char* name;
   TestFunc    func;
 } tests[] = {
   DECL_TEST(test_pldhash_Init_capacity_ok),
   DECL_TEST(test_pldhash_Init_capacity_too_large),
   DECL_TEST(test_pldhash_Init_overflow),
-// See bug 931062, we skip this test on Android due to OOM.
-#ifndef MOZ_WIDGET_ANDROID
   DECL_TEST(test_pldhash_grow_to_max_capacity),
-#endif
   { nullptr, nullptr }
 };
 
 } // namespace TestPLDHash
 
 using namespace TestPLDHash;
 
 int main(int argc, char *argv[])