From dc66d5ab3390525f19a9e805c16da0dc0f3d5ac9 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Tue, 21 Jun 2016 12:57:55 +0300
Subject: [PATCH] Bug 1281032 - skip entire directory on non linux. r=Tomcat

MozReview-Commit-ID: 2RdEP1J7sTi

--HG--
extra : rebase_source : f38ff53ec1b9e1e968ff89ead2479ea592ee20a4
---
 browser/components/shell/test/browser.ini       | 3 ++-
 browser/components/shell/test/browser_420786.js | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/components/shell/test/browser.ini b/browser/components/shell/test/browser.ini
index 9dbb9ccae48c..8f18415c0712 100644
--- a/browser/components/shell/test/browser.ini
+++ b/browser/components/shell/test/browser.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
+skip-if = os != "linux"
 
 [browser_420786.js]
 [browser_633221.js]
-skip-if = os != "linux"
+
diff --git a/browser/components/shell/test/browser_420786.js b/browser/components/shell/test/browser_420786.js
index 8824fd6371a9..0e9ff2bd7b2c 100644
--- a/browser/components/shell/test/browser_420786.js
+++ b/browser/components/shell/test/browser_420786.js
@@ -72,10 +72,6 @@ function onPageLoad() {
 function test() {
   var osString = Cc["@mozilla.org/xre/app-info;1"].
                  getService(Ci.nsIXULRuntime).OS;
-  if (osString != "Linux") {
-    todo(false, "This test is Linux specific for now.");
-    return;
-  }
 
   try {
     // If GSettings is available, then the GConf tests