wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 958147 - Choose one of run-if or skip-if and get rid of the other.r=jmaher, mwargers

Browse Source
This commit is contained in:
Anish 2015-03-03 08:46:37 -05:00
parent faaa00a85c
commit 9b39f2745a
21 changed files with 67 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/plugins/browser.ini
View File

@ -56,7 +56,7 @@ support-files =
[browser_CTP_context_menu.js]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342)
[browser_CTP_crashreporting.js]
run-if = crashreporter
skip-if = !crashreporter
[browser_CTP_data_urls.js]
[browser_CTP_drag_drop.js]
[browser_CTP_hide_overlay.js]
@ -75,5 +75,5 @@ run-if = crashreporter
[browser_pluginplaypreview2.js]
[browser_pluginplaypreview3.js]
[browser_pluginCrashCommentAndURL.js]
run-if = crashreporter
skip-if = !crashreporter
[browser_plugins_added_dynamically.js]

2
browser/components/preferences/in-content/tests/browser.ini
View File

@ -11,7 +11,7 @@ support-files =
[browser_bug1018066_resetScrollPosition.js]
[browser_bug1020245_openPreferences_to_paneContent.js]
[browser_change_app_handler.js]
run-if = os == "win" # This test tests the windows-specific app selection dialog, so can't run on non-Windows
skip-if = os != "win" # This test tests the windows-specific app selection dialog, so can't run on non-Windows
[browser_connection.js]
[browser_connection_bug388287.js]
[browser_healthreport.js]

2
browser/components/shell/test/browser.ini
View File

@ -2,4 +2,4 @@
[browser_420786.js]
[browser_633221.js]
run-if = os == "linux"
skip-if = os != "linux"

3
browser/components/uitour/test/browser.ini
View File

@ -23,8 +23,7 @@ skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly.
[browser_UITour_loop.js]
skip-if = os == "linux" || e10s # Bug 941428 - UITour.jsm not e10s friendly.
[browser_UITour_modalDialog.js]
run-if = os == "mac" # modal dialog disabling only working on OS X
skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
skip-if = os != "mac" || e10s # modal dialog disabling only working on OS X.Bug 941428 - UITour.jsm not e10s friendly
[browser_UITour_observe.js]
skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly.
[browser_UITour_panel_close_annotation.js]

3
build/docs/test_manifests.rst
View File

@ -128,9 +128,6 @@ dupe-manifest
The value of this key is ignored.
run-if
Run this test only if the specified condition is true.
See :ref:`manifest_filter_language`.
skip-if
Skip this test if the specified condition is true.

2
dom/apps/tests/chrome.ini
View File

@ -6,7 +6,7 @@ support-files =
[test_apps_service.xul]
[test_bug_945152.html]
run-if = os == 'linux'
skip-if = os != 'linux'
[test_tha_utils.html]
[test_manifest_helper.xul]
[test_operator_app_install.js]

4
dom/base/test/mochitest.ini
View File

@ -661,10 +661,10 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e1
[test_bug922681.html]
[test_bug927196.html]
[test_bug945152.html]
run-if = os == 'linux'
skip-if = os != 'linux'
[test_bug982153.html]
[test_bug1008126.html]
run-if = os == 'linux'
skip-if = os != 'linux'
[test_bug1057176.html]
[test_bug1070015.html]
[test_bug1075702.html]

6
dom/ipc/tests/mochitest.ini
View File

@ -9,8 +9,8 @@ skip-if = buildapp == 'b2g' || buildapp == 'mulet'
[test_NuwaProcessCreation.html]
skip-if = toolkit != 'gonk'
[test_NuwaProcessDeadlock.html]
run-if = toolkit == 'gonk'
skip-if = toolkit != 'gonk'
[test_child_docshell.html]
run-if = toolkit != 'cocoa' # disabled due to hangs, see changeset 6852e7c47edf
skip-if = toolkit == 'cocoa' # disabled due to hangs, see changeset 6852e7c47edf
[test_CrashService_crash.html]
run-if = crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk')
skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk'))

8
dom/media/test/mochitest.ini
View File

@ -542,14 +542,14 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
# The tests below contain backend-specific tests. Write backend independent
# tests rather than adding to this list.
[test_can_play_type_webm.html]
run-if = webm
skip-if = !webm
[test_can_play_type_no_webm.html]
skip-if = webm
[test_can_play_type_wave.html]
run-if = wave
skip-if = !wave
[test_can_play_type_no_wave.html]
skip-if = wave
[test_fragment_noplay.html]
run-if = wave
skip-if = !wave
[test_fragment_play.html]
run-if = wave
skip-if = !wave

16
dom/mobilemessage/tests/xpcshell/xpcshell.ini
View File

@ -4,18 +4,18 @@ tail =
[test_smsservice_createsmsmessage.js]
[test_wsp_pdu_helper.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_wsp_pdu_helper_header.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_wsp_pdu_helper_numeric.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_wsp_pdu_helper_parameter.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_wsp_pdu_helper_text.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_mms_pdu_helper.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_mms_service.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_sms_segment_helper.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"

4
dom/requestsync/tests/mochitest.ini
View File

@ -11,9 +11,9 @@ support-files =
[test_minInterval.html]
[test_basic.html]
[test_basic_app.html]
run-if = buildapp != 'b2g'
skip-if = buildapp == 'b2g'
[test_wakeUp.html]
run-if = buildapp == 'b2g' && toolkit == 'gonk'
skip-if = !(buildapp == 'b2g' && toolkit == 'gonk')
[test_runNow.html]
run-if = buildapp == 'b2g' && toolkit == 'gonk'
[test_promise.html]

2
image/test/mochitest/mochitest.ini
View File

@ -93,5 +93,5 @@ skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost c
[test_error_events.html]
[test_short_gif_header.html]
[test_image_buffer_limit.html]
#run-if = toolkit == "gonk" #Image buffer limit is only set for Firefox OS currently.
#skip-if = toolkit != "gonk" #Image buffer limit is only set for Firefox OS currently.
disabled = bug 1060869

2
intl/locale/tests/unit/xpcshell.ini
View File

@ -11,7 +11,7 @@ skip-if = toolkit != "windows" && toolkit != "cocoa"
skip-if = toolkit == "windows" || toolkit == "cocoa"
[test_collation_mac_icu.js]
run-if = toolkit == "cocoa"
skip-if = toolkit != "cocoa"
[test_bug1086527.js]
[test_pluralForm.js]

2
memory/replace/dmd/test/xpcshell.ini
View File

@ -29,4 +29,4 @@ support-files =
# Bug 1077230 explains why this test is disabled on Mac 10.6.
[test_dmd.js]
dmd = true
run-if = os == 'linux' || os == 'mac' && os_version != '10.6' || os == 'win'
skip-if = !(os=='linux' || os=='win') || (os=='mac' && os_version=='10.6')

2
services/healthreport/tests/xpcshell/xpcshell.ini
View File

@ -10,7 +10,7 @@ skip-if = toolkit == 'android' || toolkit == 'gonk'
skip-if = buildapp == 'mulet'
[test_provider_appinfo.js]
[test_provider_crashes.js]
run-if = crashreporter
skip-if = !crashreporter
[test_provider_hotfix.js]
[test_provider_places.js]
[test_provider_searches.js]

6
testing/cppunittest.ini
View File

@ -14,7 +14,7 @@ skip-if = os == 'b2g' # Bug 1062937
[TestBind]
[TestBloomFilter]
[TestCOM]
run-if = os == 'win'
skip-if = os != 'win'
[TestCOMArray]
[TestCOMPtr]
[TestCOMPtrEq]
@ -32,7 +32,7 @@ skip-if = os == 'b2g' # Bug 1054249
[TestDeadlockDetectorScalability]
[TestDeque]
[TestDllInterceptor]
run-if = os == 'win'
skip-if = os != 'win'
[TestEndian]
[TestEnumSet]
[TestFile]
@ -51,7 +51,7 @@ run-if = os == 'win'
skip-if = os == 'b2g' || os == 'android' #Bug 919642
[TestNsRefPtr]
[TestNtPathToDosPath]
run-if = os == 'win'
skip-if = os != 'win'
[TestObserverArray]
[TestObserverService]
[TestPLDHash]

6
testing/mozbase/docs/manifestparser.rst
View File

@ -75,7 +75,7 @@ advantages:
.. code-block:: text
[test_works_on_windows_only.js]
run-if = os == 'win'
skip-if = os != 'win'
* ability to markup tests with metadata. We have a large, complicated,
and always changing infrastructure. key, value metadata may be used
@ -253,7 +253,7 @@ metadata. Despite the internal variable being called `self.tests`
(an oversight), this layer has nothing in particular to do with tests.
2. TestManifest: this is a harness-agnostic integration layer that is
test-specific. TestManifest faciliates `skip-if` and `run-if` logic.
test-specific. TestManifest faciliates `skip-if` logic.
3. Optionally, a harness will have an integration layer than inherits
from TestManifest if more harness-specific customization is desired at
@ -283,7 +283,7 @@ By default, `active_tests` runs the filters found in
1. `exists`: if True (default), filter out tests that do not exist on the local file system.
2. `disabled`: if True (default), do not filter out tests containing the 'disabled' key
(which can be set by `skip-if`, `run-if` or manually).
(which can be set by `skip-if` manually).
This works for simple cases, but there are other built-in filters, or even custom filters
that can be applied to the `TestManifest`. To do so, add the filter to `TestManifest.filters`:

2
testing/mozbase/manifestparser/tests/filter-example.ini
View File

@ -1,7 +1,7 @@
# illustrate test filters based on various categories
[windowstest]
run-if = os == 'win'
skip-if = os != 'win'
[fleem]
skip-if = os == 'mac'

2
toolkit/components/downloads/test/unit/xpcshell.ini
View File

@ -12,7 +12,7 @@ support-files =
[test_app_rep.js]
[test_app_rep_windows.js]
run-if = os == "win"
skip-if = os != "win"
[test_bug_382825.js]
[test_bug_384744.js]
[test_bug_395092.js]

2
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
View File

@ -13,7 +13,7 @@ support-files =
[test_cacheflush.js]
[test_DeferredSave.js]
[test_gmpProvider.js]
run-if = appname == "firefox"
skip-if = appname != "firefox"
[test_isReady.js]
[test_metadata_update.js]
[test_pluginInfoURL.js]

58
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
View File

@ -19,67 +19,67 @@ skip-if = toolkit == 'gonk'
reason = bug 820380
[marStageSuccessPartial.js]
[marVersionDowngrade.js]
run-if = os == 'win'
skip-if = os != 'win'
[marWrongChannel.js]
run-if = os == 'win'
skip-if = os != 'win'
[marStageFailurePartial.js]
[marCallbackAppSuccessComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marCallbackAppSuccessPartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marCallbackAppStageSuccessComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marCallbackAppStageSuccessPartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marAppInUseSuccessComplete.js]
skip-if = toolkit == 'gonk'
[marAppInUseStageSuccessComplete_unix.js]
run-if = os == 'linux' || os == 'sunos' || os == 'mac'
skip-if = !(os == 'linux' || os == 'sunos' || os == 'mac')
[marAppInUseStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marAppInUseFallbackStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedFallbackStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileLockedFallbackStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseSuccessComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseSuccessPartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseSuccessComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseSuccessPartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseFallbackStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marFileInUseFallbackStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseFallbackStageFailureComplete_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marRMRFDirFileInUseFallbackStageFailurePartial_win.js]
run-if = os == 'win'
skip-if = os != 'win'
reason = bug 820380
[marAppApplyDirLockedStageFailure_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marAppApplyUpdateAppBinInUseStageSuccess_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[marAppApplyUpdateSuccess.js]
skip-if = toolkit == 'gonk'
reason = bug 820380