Bug 958147 - Choose one of run-if or skip-if and get rid of the other.r=jmaher, mwargers
authorAnish <anishchandran94@gmail.com>
Tue, 03 Mar 2015 08:46:37 -0500
changeset 247054 451dda8136376fe868302643edb0f26ba0d46ecd
parent 247053 346347b1255daf5625aeac8e90814fca5e05aa05
child 247055 f43843d3fb0e5cd44e07dbcd4932b7579348cb96
push id884
push userdburns@mozilla.com
push dateTue, 03 Mar 2015 15:29:12 +0000
reviewersjmaher, mwargers
bugs958147
milestone39.0a1
Bug 958147 - Choose one of run-if or skip-if and get rid of the other.r=jmaher, mwargers
browser/base/content/test/plugins/browser.ini
browser/components/preferences/in-content/tests/browser.ini
browser/components/shell/test/browser.ini
browser/components/uitour/test/browser.ini
build/docs/test_manifests.rst
dom/apps/tests/chrome.ini
dom/base/test/mochitest.ini
dom/ipc/tests/mochitest.ini
dom/media/test/mochitest.ini
dom/mobilemessage/tests/xpcshell/xpcshell.ini
dom/requestsync/tests/mochitest.ini
image/test/mochitest/mochitest.ini
intl/locale/tests/unit/xpcshell.ini
memory/replace/dmd/test/xpcshell.ini
services/healthreport/tests/xpcshell/xpcshell.ini
testing/cppunittest.ini
testing/mozbase/docs/manifestparser.rst
testing/mozbase/manifestparser/tests/filter-example.ini
toolkit/components/downloads/test/unit/xpcshell.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
--- a/browser/base/content/test/plugins/browser.ini
+++ b/browser/base/content/test/plugins/browser.ini
@@ -51,17 +51,17 @@ support-files =
 [browser_bug797677.js]
 [browser_bug812562.js]
 [browser_bug818118.js]
 [browser_bug820497.js]
 [browser_clearplugindata.js]
 [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]
 [browser_CTP_iframe.js]
 [browser_CTP_multi_allow.js]
 [browser_CTP_nonplugins.js]
 [browser_CTP_notificationBar.js]
 [browser_CTP_outsideScrollArea.js]
@@ -70,10 +70,10 @@ run-if = crashreporter
 [browser_CTP_zoom.js]
 [browser_globalplugin_crashinfobar.js]
 [browser_pageInfo_plugins.js]
 [browser_pluginnotification.js]
 [browser_pluginplaypreview.js]
 [browser_pluginplaypreview2.js]
 [browser_pluginplaypreview3.js]
 [browser_pluginCrashCommentAndURL.js]
-run-if = crashreporter
+skip-if = !crashreporter
 [browser_plugins_added_dynamically.js]
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -6,17 +6,17 @@ support-files =
 
 [browser_advanced_update.js]
 [browser_bug410900.js]
 [browser_bug731866.js]
 [browser_bug795764_cachedisabled.js]
 [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]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_proxy_backup.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
--- a/browser/components/shell/test/browser.ini
+++ b/browser/components/shell/test/browser.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 
 [browser_420786.js]
 [browser_633221.js]
-run-if = os == "linux"
+skip-if = os != "linux"
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -18,18 +18,17 @@ skip-if = e10s # Bug 941428 - UITour.jsm
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_annotation_size_attributes.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly.
 [browser_UITour_heartbeat.js]
 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]
 skip-if = true # Disabled due to frequent failures, bugs 1026310 and 1032137
 [browser_UITour_registerPageID.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_sync.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
--- a/build/docs/test_manifests.rst
+++ b/build/docs/test_manifests.rst
@@ -123,19 +123,16 @@ dupe-manifest
 
    The common scenario is two manifest files will include a shared
    manifest file via the ``[include:file]`` special section. The build
    system enforces that each test file is only provided by a single
    manifest. Having this key present bypasses that check.
 
    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.
    See :ref:`manifest_filter_language`.
 
 fail-if
    Expect test failure if the specified condition is true.
    See :ref:`manifest_filter_language`.
--- a/dom/apps/tests/chrome.ini
+++ b/dom/apps/tests/chrome.ini
@@ -1,16 +1,16 @@
 [DEFAULT]
 support-files =
   asmjs/*
   file_bug_945152.html
   file_bug_945152.sjs
 
 [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]
 [test_operator_app_install.xul]
 # bug 928262
  skip-if = os == "win"
 [test_packaged_app_asmjs.html]
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -656,20 +656,20 @@ skip-if = buildapp == 'mulet' || buildap
 [test_bug894874.html]
 [test_bug895239.html]
 [test_bug895974.html]
 [test_bug902847.html]
 [test_bug907892.html]
 [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]
 [test_bug1101364.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
 [test_caretPositionFromPoint.html]
 [test_classList.html]
 # This test fails on the Mac for some reason
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@@ -4,13 +4,13 @@ skip-if = buildapp == 'b2g' || buildapp 
 [test_blob_sliced_from_parent_process.html]
 # This test is only supposed to run in the main process.
 skip-if = buildapp == 'b2g' || buildapp == 'mulet' || e10s
 [test_cpow_cookies.html]
 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'))
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -537,19 +537,19 @@ skip-if = (toolkit == 'android' && proce
 [test_VideoPlaybackQuality_disabled.html]
 [test_volume.html]
 [test_vttparser.html]
 [test_webvtt_disabled.html]
 
 # 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
--- a/dom/mobilemessage/tests/xpcshell/xpcshell.ini
+++ b/dom/mobilemessage/tests/xpcshell/xpcshell.ini
@@ -1,21 +1,21 @@
 [DEFAULT]
 head = header_helpers.js
 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"
--- a/dom/requestsync/tests/mochitest.ini
+++ b/dom/requestsync/tests/mochitest.ini
@@ -6,14 +6,14 @@ support-files =
   file_basic_app.html
   common_app.js
   common_basic.js
 
 [test_webidl.html]
 [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]
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -88,10 +88,10 @@ skip-if = (toolkit == 'android' && proce
 [test_bug89419-2.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 [test_animation_operators.html]
 [test_drawDiscardedImage.html]
 skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost connection to device.
 [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
--- a/intl/locale/tests/unit/xpcshell.ini
+++ b/intl/locale/tests/unit/xpcshell.ini
@@ -6,14 +6,14 @@ skip-if = toolkit == 'gonk'
 [test_bug22310.js]
 skip-if = toolkit != "windows" && toolkit != "cocoa"
 
 [test_bug371611.js]
 [test_bug374040.js]
 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]
 [test_pluralForm_english.js]
 [test_pluralForm_makeGetter.js]
--- a/memory/replace/dmd/test/xpcshell.ini
+++ b/memory/replace/dmd/test/xpcshell.ini
@@ -24,9 +24,9 @@ support-files =
   script-diff-live-expected.txt
   script-diff-dark-matter1.json
   script-diff-dark-matter2.json
   script-diff-dark-matter-expected.txt
 
 # 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')
--- a/services/healthreport/tests/xpcshell/xpcshell.ini
+++ b/services/healthreport/tests/xpcshell/xpcshell.ini
@@ -5,15 +5,15 @@ skip-if = toolkit == 'android' || toolki
 
 [test_load_modules.js]
 [test_profile.js]
 [test_healthreporter.js]
 [test_provider_addons.js]
 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]
 [test_provider_sysinfo.js]
 [test_provider_sessions.js]
 
--- a/testing/cppunittest.ini
+++ b/testing/cppunittest.ini
@@ -9,17 +9,17 @@ skip-if = os == 'b2g'  # Bug 1062937
 [TestAudioEventTimeline]
 [TestAudioMixer]
 [TestAutoPtr]
 [TestAutoRef]
 [TestBinarySearch]
 [TestBind]
 [TestBloomFilter]
 [TestCOM]
-run-if = os == 'win'
+skip-if = os != 'win'
 [TestCOMArray]
 [TestCOMPtr]
 [TestCOMPtrEq]
 [TestCSPParser]
 skip-if = os == 'b2g' # Bug 1054246
 [TestCasting]
 [TestCeilingFloor]
 [TestCertDB]
@@ -27,17 +27,17 @@ skip-if = os == 'b2g' # Bug 1054246
 [TestCookie]
 [TestCountPopulation]
 [TestCountZeroes]
 [TestDeadlockDetector]
 skip-if = os == 'b2g'  # Bug 1054249
 [TestDeadlockDetectorScalability]
 [TestDeque]
 [TestDllInterceptor]
-run-if = os == 'win'
+skip-if = os != 'win'
 [TestEndian]
 [TestEnumSet]
 [TestFile]
 [TestFloatingPoint]
 [TestGetURL]
 [TestHashtables]
 [TestID]
 [TestIntegerPrintfMacros]
@@ -46,17 +46,17 @@ run-if = os == 'win'
 [TestLineBreak]
 [TestMacroArgs]
 [TestMacroForEach]
 [TestMaybe]
 [TestNativeXMLHttpRequest]
 skip-if = os == 'b2g' || os == 'android'  #Bug 919642
 [TestNsRefPtr]
 [TestNtPathToDosPath]
-run-if = os == 'win'
+skip-if = os != 'win'
 [TestObserverArray]
 [TestObserverService]
 [TestPLDHash]
 skip-if = os == 'b2g'  #Bug 1038197
 [TestPair]
 [TestPipe]
 [TestPlainTextSerializer]
 skip-if = os == 'b2g' || os == 'android'  #Bug 919599
--- a/testing/mozbase/docs/manifestparser.rst
+++ b/testing/mozbase/docs/manifestparser.rst
@@ -70,17 +70,17 @@ advantages:
   platforms. Traditionally, we've done a bit of magic or had the test
   know what platform it would or would not run on. With manifests, you
   can mark what platforms a test will or will not run on and change
   these without changing the test.
 
 .. 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
   as an annotation to a test and appropriately curated and mined.  For
   instance, we could mark certain tests as randomorange with a bug
   number, if it were desirable.
 
 * ability to have sane and well-defined test-runs. You can keep
@@ -248,17 +248,17 @@ There is a two- or three-layered approac
 architecture, depending on your needs:
 
 1. ManifestParser: this is a generic parser for .ini manifests that
 facilitates the `[include:]` logic and the inheritence of
 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
 the manifest level.
 
 See the source code at https://github.com/mozilla/mozbase/tree/master/manifestparser
 and
 https://github.com/mozilla/mozbase/blob/master/manifestparser/manifestparser.py
@@ -278,17 +278,17 @@ To do this, a test harness can call `Tes
 
     tests = manifest.active_tests(exists=True, disabled=True, **tags)
 
 By default, `active_tests` runs the filters found in
 :attr:`~.DEFAULT_FILTERS`. It also accepts two convenience arguments:
 
 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`:
 
 .. code-block:: python
 
     from manifestparser.filters import subsuite
     import mozinfo
--- a/testing/mozbase/manifestparser/tests/filter-example.ini
+++ b/testing/mozbase/manifestparser/tests/filter-example.ini
@@ -1,11 +1,11 @@
 # illustrate test filters based on various categories
 
 [windowstest]
-run-if = os == 'win'
+skip-if = os != 'win'
 
 [fleem]
 skip-if = os == 'mac'
 
 [linuxtest]
 skip-if = (os == 'mac') || (os == 'win')
 fail-if = toolkit == 'cocoa'
--- a/toolkit/components/downloads/test/unit/xpcshell.ini
+++ b/toolkit/components/downloads/test/unit/xpcshell.ini
@@ -7,17 +7,17 @@ support-files =
   downloads_manifest.js
   test_downloads.manifest
   data/digest.chunk
   data/block_digest.chunk
   data/signed_win.exe
 
 [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]
 [test_bug_401430.js]
 [test_bug_406857.js]
 [test_bug_420230.js]
 [test_cancel_download_files_removed.js]
 # Bug 676989: test hangs consistently on Android
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -8,17 +8,17 @@ support-files =
   data/**
   xpcshell-shared.ini
 
 [test_addon_path_service.js]
 [test_asyncBlocklistLoad.js]
 [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]
 [test_provider_markSafe.js]
 [test_provider_shutdown.js]
 [test_provider_unsafe_access_shutdown.js]
 [test_provider_unsafe_access_startup.js]
 [test_shutdown.js]
--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -14,74 +14,74 @@ skip-if = toolkit == 'android'
 [marSuccessComplete.js]
 [marSuccessPartial.js]
 [marFailurePartial.js]
 [marStageSuccessComplete.js]
 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
 [marAppApplyUpdateStageSuccess.js]
 skip-if = toolkit == 'gonk'