Bug 1545231 - Enable some android gtests in image/test/gtest; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Mon, 06 May 2019 18:51:59 +0000
changeset 531573 13e4fc503ed3cacd5a4f2c84f9d8abea501adae2
parent 531572 a7e62502388cab9d11a42f7596a611df477c27a7
child 531574 a2140a82142575eed29c3835a41cdfb72253c0ee
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
bugs1545231, 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 1545231 - Enable some android gtests in image/test/gtest; r=jmaher With changes from bug 1548555, all of the gtests previously disabled on Android can be re-enabled. Differential Revision: https://phabricator.services.mozilla.com/D30069
image/test/gtest/moz.build
--- a/image/test/gtest/moz.build
+++ b/image/test/gtest/moz.build
@@ -6,32 +6,28 @@
 
 Library('imagetest')
 
 UNIFIED_SOURCES = [
     'Common.cpp',
     'TestADAM7InterpolatingFilter.cpp',
     'TestAnimationFrameBuffer.cpp',
     'TestBlendAnimationFilter.cpp',
+    'TestContainers.cpp',
     'TestCopyOnWrite.cpp',
     'TestDeinterlacingFilter.cpp',
+    'TestFrameAnimator.cpp',
     'TestLoader.cpp',
     'TestRemoveFrameRectFilter.cpp',
     'TestStreamingLexer.cpp',
     'TestSurfaceSink.cpp',
 ]
 
-if CONFIG['OS_TARGET'] != 'Android':
-    UNIFIED_SOURCES += [
-        'TestContainers.cpp',
-        'TestFrameAnimator.cpp',
-    ]
-
-# skip the test on windows10-aarch64 and Android, aarch64 due to 1544961
-if not(CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'aarch64') and (CONFIG['OS_TARGET'] != 'Android'):
+# skip the test on windows10-aarch64, aarch64 due to 1544961
+if not(CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'aarch64'):
     UNIFIED_SOURCES += [
         'TestDecoders.cpp',
         'TestDecodeToSurface.cpp',
         'TestMetadata.cpp',
         'TestSourceBuffer.cpp',
         'TestSurfaceCache.cpp',
     ]