Bug 931062 - Unit test TestPLDHash.cpp fails on Android; r=njn

This commit is contained in:
Dan Minor 2013-11-04 09:28:34 -05:00
parent b3bd920dc4
commit 8bacbf99f6

View File

@ -18,8 +18,7 @@ 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. Hopefully that's not too much for the test machines to handle
// reliably.
// platforms.
PLDHashTable t;
bool ok = PL_DHashTableInit(&t, PL_DHashGetStubOps(), nullptr,
sizeof(PLDHashEntryStub), PL_DHASH_MAX_SIZE);
@ -62,6 +61,8 @@ static bool test_pldhash_Init_overflow()
return !ok; // expected to fail
}
// See bug 931062, we skip this test on Android due to OOM.
#ifndef MOZ_WIDGET_ANDROID
// We insert the integers 0.., so this is has function is (a) as simple as
// possible, and (b) collision-free. Both of which are good, because we want
// this test to be as fast as possible.
@ -102,6 +103,7 @@ static bool test_pldhash_grow_to_max_capacity()
// MaxLoadOnGrowthFailure()).
return numInserted == PL_DHASH_MAX_SIZE - (PL_DHASH_MAX_SIZE >> 5);
}
#endif
//----
@ -115,7 +117,10 @@ static const struct Test {
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 }
};