Bug 1545217 - Enable some android gtests in xpcom/tests/gtest; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Mon, 06 May 2019 18:53:55 +0000
changeset 531574 a2140a82142575eed29c3835a41cdfb72253c0ee
parent 531573 13e4fc503ed3cacd5a4f2c84f9d8abea501adae2
child 531575 7a580c406283099dae7a2abcc483e16f17d6d51f
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1545217, 1548555
milestone68.0a1
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
Bug 1545217 - Enable some android gtests in xpcom/tests/gtest; r=jmaher With changes from bug 1548555, some of the gtests previously disabled on Android can be re-enabled. Differential Revision: https://phabricator.services.mozilla.com/D30080
xpcom/tests/gtest/moz.build
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -2,19 +2,21 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
     'Helpers.cpp',
     'TestArenaAllocator.cpp',
+    'TestAtoms.cpp',
     'TestAutoPtr.cpp',
     'TestAutoRef.cpp',
     'TestAutoRefCnt.cpp',
+    'TestBase64.cpp',
     'TestCallTemplates.cpp',
     'TestCloneInputStream.cpp',
     'TestCOMPtrEq.cpp',
     'TestCRT.cpp',
     'TestDafsa.cpp',
     'TestEncoding.cpp',
     'TestEscape.cpp',
     'TestEventPriorities.cpp',
@@ -38,39 +40,37 @@ UNIFIED_SOURCES += [
     'TestPriorityQueue.cpp',
     'TestRacingServiceManager.cpp',
     'TestRecursiveMutex.cpp',
     'TestRWLock.cpp',
     'TestSlicedInputStream.cpp',
     'TestSnappyStreams.cpp',
     'TestStateWatching.cpp',
     'TestStorageStream.cpp',
+    'TestStrings.cpp',
     'TestStringStream.cpp',
     'TestSynchronization.cpp',
     'TestTArray.cpp',
     'TestTArray2.cpp',
     'TestTaskQueue.cpp',
     'TestTextFormatter.cpp',
     'TestThreadManager.cpp',
     'TestThreadMetrics.cpp',
     'TestThreadPool.cpp',
     'TestThreadPoolListener.cpp',
+    'TestThreads.cpp',
     'TestThrottledEventQueue.cpp',
     'TestTimeStamp.cpp',
     'TestTokenizer.cpp',
     'TestUTF.cpp',
 ]
 
 if CONFIG['OS_TARGET'] != 'Android':
     UNIFIED_SOURCES += [
-        'TestAtoms.cpp',
-        'TestBase64.cpp',
         'TestPipes.cpp',
-        'TestStrings.cpp',
-        'TestThreads.cpp',
     ]
 
 # skip the test on windows10-aarch64 due to perma-fail, bug 1422219
 if not(CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'aarch64'):
     UNIFIED_SOURCES += [
         'TestThreadUtils.cpp'
     ]
 
@@ -93,17 +93,16 @@ if CONFIG['OS_TARGET'] == 'WINNT':
     UNIFIED_SOURCES += [
         'TestFilePreferencesWin.cpp',
     ]
 else:
     UNIFIED_SOURCES += [
         'TestFilePreferencesUnix.cpp',
     ]
 
-
 if CONFIG['WRAP_STL_INCLUDES'] and CONFIG['CC_TYPE'] != 'clang-cl' and CONFIG['OS_TARGET'] != 'Android':
     UNIFIED_SOURCES += [
         'TestSTLWrappers.cpp',
     ]
 
 # Compile TestAllocReplacement separately so Windows headers don't pollute
 # the global namespace for other files.
 SOURCES += [