diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /xpcom/tests | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
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 421927104..c932b8faa 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 ac98c2217..4ed242d03 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', |