Bug 1545235 - Enable some android gtests in dom/media/gtest; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Mon, 06 May 2019 18:53:54 +0000
changeset 472758 6ad9e06a93c41b68e4a5be8587a47b49e73e3db4
parent 472757 7a580c406283099dae7a2abcc483e16f17d6d51f
child 472759 f7adce9bf91ca23f8137bb4cf9cf5630b5f75613
push id84816
push usergbrown@mozilla.com
push dateMon, 06 May 2019 18:55:52 +0000
treeherderautoland@6ad9e06a93c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1545235, 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 1545235 - Enable some android gtests in dom/media/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/D30084
dom/media/gtest/moz.build
dom/media/gtest/mp4_demuxer/moz.build
--- a/dom/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@@ -24,22 +24,28 @@ UNIFIED_SOURCES += [
     'TestBitWriter.cpp',
     'TestBlankVideoDataCreator.cpp',
     'TestBufferReader.cpp',
     'TestDataMutex.cpp',
     'TestDriftCompensation.cpp',
     'TestGMPUtils.cpp',
     'TestGroupId.cpp',
     'TestIntervalSet.cpp',
+    'TestMediaDataDecoder.cpp',
+    'TestMediaDataEncoder.cpp',
     'TestMediaEventSource.cpp',
     'TestMediaMIMETypes.cpp',
+    'TestMP3Demuxer.cpp',
+    'TestMP4Demuxer.cpp',
     'TestOpusParser.cpp',
     'TestRust.cpp',
     'TestVideoSegment.cpp',
     'TestVideoUtils.cpp',
+    'TestVPXDecoding.cpp',
+    'TestWebMBuffered.cpp',
 ]
 
 if CONFIG['MOZ_WEBM_ENCODER']:
     UNIFIED_SOURCES += [
         'TestVideoTrackEncoder.cpp',
         'TestWebMWriter.cpp',
         'YUVBufferGenerator.cpp',
     ]
@@ -47,22 +53,16 @@ if CONFIG['MOZ_WEBM_ENCODER']:
         '/gfx/2d/',
     ]
 
 if CONFIG['OS_TARGET'] != 'Android':
     UNIFIED_SOURCES += [
         'TestCDMStorage.cpp',
         'TestGMPCrossOrigin.cpp',
         'TestGMPRemoveAndDelete.cpp',
-        'TestMediaDataDecoder.cpp',
-        'TestMediaDataEncoder.cpp',
-        'TestMP3Demuxer.cpp',
-        'TestMP4Demuxer.cpp',
-        'TestVPXDecoding.cpp',
-        'TestWebMBuffered.cpp',
     ]
 
 if CONFIG['MOZ_WEBRTC'] and CONFIG['OS_TARGET'] != 'Android':
     UNIFIED_SOURCES += [
         'TestAudioDeviceEnumerator.cpp',
         'TestVideoFrameConverter.cpp',
     ]
 
--- a/dom/media/gtest/mp4_demuxer/moz.build
+++ b/dom/media/gtest/mp4_demuxer/moz.build
@@ -3,20 +3,23 @@
 # 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/.
 
 Library('mp4_demuxer_gtest')
 
 if CONFIG['OS_TARGET'] != 'Android':
     SOURCES += [
-        'TestInterval.cpp',
         'TestParser.cpp',
     ]
 
+SOURCES += [
+    'TestInterval.cpp',
+]
+
 TEST_HARNESS_FILES.gtest += [
     'test_case_1156505.mp4',
     'test_case_1181213.mp4',
     'test_case_1181215.mp4',
     'test_case_1181220.mp4',
     'test_case_1181223.mp4',
     'test_case_1181719.mp4',
     'test_case_1185230.mp4',
@@ -44,18 +47,17 @@ TEST_HARNESS_FILES.gtest += [
     'test_case_1395244.mp4',
     'test_case_1410565.mp4',
     'test_case_1513651-2-sample-description-entries.mp4',
     'test_case_1519617-cenc-init-with-track_id-0.mp4',
     'test_case_1519617-track2-trafs-removed.mp4',
     'test_case_1519617-video-has-track_id-0.mp4',
 ]
 
-if CONFIG['OS_TARGET'] != 'Android':
-    UNIFIED_SOURCES += ['TestMP4.cpp',]
+UNIFIED_SOURCES += ['TestMP4.cpp',]
 
 TEST_HARNESS_FILES.gtest += [
     '../../test/street.mp4',
 ]
 LOCAL_INCLUDES += [
     '../../mp4',
     '/toolkit/components/telemetry/tests/gtest',
 ]