From 8c76ba6b0a7ea704fa2a49f8540f1cd8bba29c98 Mon Sep 17 00:00:00 2001 From: Alastor Wu Date: Sat, 16 Sep 2017 02:14:23 +0800 Subject: [PATCH] Bug 1400195 - remove xp constraint for tests. r=jya MozReview-Commit-ID: BawMiEVPNFA --HG-- extra : rebase_source : 0f653a020a2cdfaff76c8ef2ee477e02796c646b --- dom/media/mediasource/test/mochitest.ini | 76 ++++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dom/media/mediasource/test/mochitest.ini b/dom/media/mediasource/test/mochitest.ini index 83cf2c00fbe4..ca1b57475bd3 100644 --- a/dom/media/mediasource/test/mochitest.ini +++ b/dom/media/mediasource/test/mochitest.ini @@ -47,117 +47,117 @@ support-files = avc3/init.mp4 avc3/init.mp4^headers^ avc3/segment1.m4s avc3/segment1.m4s^headers^ [test_AVC3_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_AudioChange_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_AutoRevocation.html] tags = firstpartyisolation [test_BufferedSeek.html] skip-if = android_version == '22' # bug 1329532 bug 1066090 [test_BufferedSeek_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_BufferingWait.html] skip-if = toolkit == 'android' #timeout android bug 1199531 [test_BufferingWait_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_ChangeWhileWaitingOnMissingData_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_DrainOnMissingData_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_DurationChange.html] [test_DurationUpdated.html] [test_DurationUpdated_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_EndedEvent.html] skip-if = android_version == '22' # bug 1358640 [test_EndOfStream.html] [test_EndOfStream_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_Eviction_mp4.html] -skip-if = (os == "win" && os_version == "5.1") || (android_version == '15') # Not supported on xp. Android(Bug 1358271) +skip-if = android_version == '15' # Not supported on Android(Bug 1358271) [test_FrameSelection.html] skip-if = android_version == '22' # bug 1341519 [test_FrameSelection_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_HaveMetadataUnbufferedSeek.html] skip-if = android_version == '22' # bug 1342247 [test_HaveMetadataUnbufferedSeek_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_LiveSeekable.html] [test_LoadedDataFired_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_LoadedMetadataFired.html] [test_LoadedMetadataFired_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_MediaSource.html] skip-if = android_version == '22' # bug 1341146 [test_MediaSource_memory_reporting.html] skip-if = android_version == '22' # bug 1225758 [test_MediaSource_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_MediaSource_flac_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android +skip-if = toolkit == 'android' # Not supported on android [test_MediaSource_disabled.html] [test_MultipleInitSegments.html] [test_MultipleInitSegments_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_OnEvents.html] skip-if = android_version == '22' # bug 1359010 [test_PlayEvents.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_PlayEventsAutoPlaying.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_PlayEventsAutoPlaying2.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_ResumeAfterClearing_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekableAfterEndOfStream.html] [test_SeekableAfterEndOfStream_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekableAfterEndOfStreamSplit.html] [test_SeekableAfterEndOfStreamSplit_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekableBeforeEndOfStream.html] [test_SeekableBeforeEndOfStream_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekableBeforeEndOfStreamSplit.html] [test_SeekableBeforeEndOfStreamSplit_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekNoData_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekedEvent_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekToEnd_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekToLastFrame_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SeekTwice_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_Sequence_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SetModeThrows.html] [test_SplitAppendDelay.html] skip-if = android_version == '22' # bug 1293896 bug 1342683 [test_SplitAppendDelay_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_SplitAppend.html] skip-if = android_version == '22' # bug 1211999 [test_SplitAppend_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_Threshold_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_TimestampOffset_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_TruncatedDuration.html] skip-if = android_version == '22' # bug 1359012 [test_TruncatedDuration_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_WaitingOnMissingData.html] skip-if = (toolkit == 'android') #timeout android only bug 1101187 [test_WaitingOnMissingData_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_WaitingOnMissingDataEnded_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android [test_WaitingToEndedTransition_mp4.html] -skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3 +skip-if = toolkit == 'android' # Not supported on android