diff options
Diffstat (limited to 'xpcom/tests')
| -rw-r--r-- | xpcom/tests/gtest/TestTArray2.cpp | 3 | ||||
| -rw-r--r-- | xpcom/tests/gtest/moz.build | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/xpcom/tests/gtest/TestTArray2.cpp b/xpcom/tests/gtest/TestTArray2.cpp index 421927104b..c932b8faab 100644 --- a/xpcom/tests/gtest/TestTArray2.cpp +++ b/xpcom/tests/gtest/TestTArray2.cpp @@ -871,8 +871,6 @@ TEST(TArray, test_swap) { } } -// Bug 1171296: Disabled on andoid due to crashes. -#if !defined(ANDROID) TEST(TArray, test_fallible) { // Test that FallibleTArray works properly; that is, it never OOMs, but @@ -909,7 +907,6 @@ TEST(TArray, test_fallible) ASSERT_TRUE(oomed) << "Didn't OOM or crash? nsTArray::SetCapacity" "must be lying."; } -#endif TEST(TArray, test_conversion_operator) { FallibleTArray<int> f; diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build index ac98c22176..4ed242d034 100644 --- a/xpcom/tests/gtest/moz.build +++ b/xpcom/tests/gtest/moz.build @@ -48,9 +48,8 @@ UNIFIED_SOURCES += [ 'TestXPIDLString.cpp', ] -if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT') and CONFIG['OS_TARGET'] != 'Android': +if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT'): # FIXME bug 523392: TestDeadlockDetector doesn't like Windows - # Bug 1054249: Doesn't work on Android UNIFIED_SOURCES += [ 'TestDeadlockDetector.cpp', 'TestDeadlockDetectorScalability.cpp', |