summaryrefslogtreecommitdiffstats
path: root/xpcom/tests/gtest
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-22 19:03:00 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:51:25 +0200
commitda15aa0fdf5ec769a0973a00d84f9fa090de0b60 (patch)
treec6f5b8197eac51be855aecdae3b5d97207cdf97e /xpcom/tests/gtest
parent867737dd4b650494404a90b8b99ea959f74462ca (diff)
downloadUXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.gz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.lz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.xz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.zip
Issue #1053 - Remove android support from XPCOM
Diffstat (limited to 'xpcom/tests/gtest')
-rw-r--r--xpcom/tests/gtest/TestTArray2.cpp3
-rw-r--r--xpcom/tests/gtest/moz.build3
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',