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

This commit is contained in:
jp111 2015-01-28 06:17:00 -05:00
parent d1ad878d99
commit 66df738a86
15 changed files with 21 additions and 24 deletions

View File

@ -1,5 +1,5 @@
[DEFAULT]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
support-files =
permission_handler_chrome.js
SandboxPromptTest.html

View File

@ -217,7 +217,7 @@ skip-if = e10s # Bug 940195 - XULBrowserWindow.isBusy is false as a remote tab s
[browser_bug565575.js]
skip-if = e10s
[browser_bug565667.js]
run-if = toolkit == "cocoa"
skip-if = toolkit != "cocoa"
[browser_bug567306.js]
skip-if = e10s # Bug XXX - Needs some massaging to run in e10s
[browser_bug575561.js]
@ -297,7 +297,7 @@ skip-if = os == "mac" || e10s # bug 967013; e10s: bug 1094761 - test hits the ne
[browser_ctrlTab.js]
[browser_customize_popupNotification.js]
[browser_datareporting_notification.js]
run-if = datareporting
skip-if = !datareporting
[browser_devedition.js]
[browser_devices_get_user_media.js]
skip-if = buildapp == 'mulet' || (os == "linux" && debug) || e10s # linux: bug 976544; e10s: bug 1071623

View File

@ -250,7 +250,7 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaug
[browser_webconsole_bug_621644_jsterm_dollar.js]
[browser_webconsole_bug_622303_persistent_filters.js]
[browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js]
run-if = os == "win"
skip-if = os != "win"
[browser_webconsole_bug_630733_response_redirect_headers.js]
[browser_webconsole_bug_632275_getters_document_width.js]
[browser_webconsole_bug_632347_iterators_generators.js]
@ -287,7 +287,7 @@ skip-if = buildapp == 'mulet' || e10s # Bug 1042253 - webconsole e10s tests (exp
[browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js]
skip-if = buildapp == 'mulet'
[browser_webconsole_bug_804845_ctrl_key_nav.js]
run-if = os == "mac"
skip-if = os != "mac"
[browser_webconsole_bug_817834_add_edited_input_to_history.js]
[browser_webconsole_bug_837351_securityerrors.js]
skip-if = buildapp == 'mulet'

View File

@ -15,5 +15,4 @@ skip-if = e10s # Bug 666804 - Support NetworkPrioritizer in e10s
[browser_SignInToWebsite.js]
skip-if = e10s # Bug 941426 - SignIntoWebsite.jsm not e10s friendly
[browser_taskbar_preview.js]
run-if = os == "win"
skip-if = e10s # Bug 666808 - AeroPeek support for e10s
skip-if = os != win || e10s # Bug 666808 - AeroPeek support for e10s

View File

@ -1,6 +1,5 @@
[DEFAULT]
run-if = buildapp == "browser"
skip-if = e10s
skip-if = (buildapp != "browser") || e10s
support-files =
head.js
browser_forgetThisSiteAdd.html

View File

@ -5,7 +5,7 @@ skip-if = buildapp == 'b2g' || buildapp == 'mulet' || e10s
# This test is only supposed to run in the main process.
skip-if = buildapp == 'b2g' || buildapp == 'mulet' || e10s
[test_NuwaProcessCreation.html]
run-if = toolkit == 'gonk'
skip-if = toolkit != 'gonk'
[test_NuwaProcessDeadlock.html]
run-if = toolkit == 'gonk'
[test_child_docshell.html]

View File

@ -4,7 +4,7 @@ skip-if = e10s
[test_bug957893.html]
[test_bug957899.html]
[test_wakelock_not_exposed.html]
run-if = appname != "b2g" && buildapp != "mulet"
skip-if = appname == "b2g" || buildapp == "mulet"
[test_power_basics.html]
[test_power_set_cpusleepallowed.html]
skip-if = toolkit != "gonk"

View File

@ -4,7 +4,7 @@ tail =
skip-if = toolkit == 'gonk'
[test_bug22310.js]
run-if = toolkit == "windows" || toolkit == "cocoa"
skip-if = toolkit != "windows" && toolkit != "cocoa"
[test_bug371611.js]
[test_bug374040.js]

View File

@ -262,10 +262,10 @@ fail-if = os == "android"
fail-if = os == "android"
# spdy and http2 unit tests require us to have node available to run the spdy and http2 server
[test_spdy.js]
run-if = hasNode
skip-if = !hasNode
run-sequentially = node server exceptions dont replay well
[test_http2.js]
run-if = hasNode
skip-if = !hasNode
run-sequentially = node server exceptions dont replay well
[test_speculative_connect.js]
[test_standardurl.js]
@ -299,7 +299,7 @@ skip-if = os == "android"
# the wild.
skip-if = os == "android"
[test_signature_extraction.js]
run-if = os == "win"
skip-if = os != "win"
[test_synthesized_response.js]
[test_udp_multicast.js]
[test_redirect_history.js]

View File

@ -10,7 +10,7 @@ skip-if = toolkit == 'gonk' # times out, bug 1073639
[test_loginmgr_storage.js]
skip-if = appname == 'b2g' # login manager storage only used on desktop.
[test_manager.js]
run-if = appname == 'b2g'
skip-if = appname != 'b2g'
reason = FxAccountsManager is only available for B2G for now
[test_oauth_client.js]
[test_profile_client.js]

View File

@ -4,4 +4,4 @@ tail =
skip-if = toolkit == 'android' || toolkit == 'gonk'
[test_filecomplete.js]
run-if = os == 'linux'
skip-if = os != 'linux'

View File

@ -23,12 +23,11 @@ skip-if = os == 'win'
[test_crashreporter_crash.js]
[test_crashreporter_crash_profile_lock.js]
[test_override_exception_handler.js]
run-if = os == 'win'
skip-if = os != 'win'
[test_crashreporter_appmem.js]
run-if = os == 'win' || os == 'linux'
# we need to skip this due to bug 838613
skip-if = os=='linux' && bits==32
skip-if = (os != 'win' && os != 'linux') || (os=='linux' && bits==32)
[test_crash_AsyncShutdown.js]
[test_event_files.js]

View File

@ -126,7 +126,7 @@ reason = bug 1104838
[test_conditional_breakpoint-02.js]
[test_conditional_breakpoint-03.js]
[test_eventlooplag_actor.js]
run-if = toolkit == "gonk"
skip-if = toolkit != "gonk"
[test_listsources-01.js]
[test_listsources-02.js]
[test_listsources-03.js]

View File

@ -68,7 +68,7 @@ reason = Bug 918029 - timeout caused by copying too many files.
skip-if = os == 'linux'
reason = Bug 918029 - timeout caused by copying too many files.
[test_0103_background_restartNotification_stagingService.xul]
run-if = os == 'win'
skip-if = os != 'win'
reason = only Windows has the maintenance service.
[test_0111_neverButton_basic.xul]
[test_0112_neverButton_billboard.xul]

View File

@ -28,7 +28,7 @@ skip-if = buildapp == "mulet" || toolkit == 'gonk'
reason = custom nsIUpdatePrompt
[downloadInterruptedByOfflineRetry.js]
[downloadFileTooBig_gonk.js]
run-if = toolkit == 'gonk'
skip-if = toolkit != 'gonk'
[uiSilentPref.js]
skip-if = toolkit == 'gonk'
reason = custom nsIUpdatePrompt
@ -39,6 +39,6 @@ reason = custom nsIUpdatePrompt
skip-if = toolkit == 'gonk'
reason = custom nsIUpdatePrompt
[updateRootDirMigration_win.js]
run-if = os == 'win'
skip-if = os != 'win'
[updateHealthReport.js]
skip-if = ! healthreport