From 04e2f1ca43ed1e35c7ec52317c59916d52e49780 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sat, 24 Jan 2015 08:24:39 -0800 Subject: [PATCH] Bug 1123085 - Disable webapp tests which fail on OS X 10.10 --- toolkit/webapps/tests/chrome.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkit/webapps/tests/chrome.ini b/toolkit/webapps/tests/chrome.ini index 774b4b142c3..0f4b1abd194 100644 --- a/toolkit/webapps/tests/chrome.ini +++ b/toolkit/webapps/tests/chrome.ini @@ -8,7 +8,7 @@ support-files = [test_custom_origin.xul] skip-if = asan [test_custom_origin_uninstall_install.xul] -skip-if = asan +skip-if = asan || (os == 'mac' && os_version == '10.10') # Bug 1123085 [test_install_appcache.xul] skip-if = asan [test_hosted.xul] @@ -22,9 +22,9 @@ skip-if = asan [test_packaged_launch_no_registry.xul] skip-if = asan [test_hosted_uninstall.xul] -skip-if = os == "win" && os_version == "5.1" # see bug 981251 +skip-if = (os == "win" && os_version == "5.1") || (os == 'mac' && os_version == '10.10') # WinXP: bug 981251; OS X 10.10: bug 1123085 [test_packaged_uninstall.xul] -skip-if = os == "win" && os_version == "5.1" # see bug 981251 +skip-if = (os == "win" && os_version == "5.1") || (os == 'mac' && os_version == '10.10') # WinXP: bug 981251; OS X 10.10: bug 1123085 [test_hosted_update_from_webapp_runtime.xul] skip-if = asan [test_packaged_update_from_webapp_runtime.xul]