Bug 1336712 - Drop test annotations and checks for Windows XP, Vista OS X < 10.9 and Android Gingerbread (2.3): browser. r?RyanVM draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 04 Feb 2017 13:43:55 +0100
changeset 478962 436a7d91042a1745f13a274709a12212bd516d1f
parent 478961 d6389000a9810bbcb3ec7f913cc6d989c43e4e46
child 478963 e52dc8fc6a35841de115043c5a6ed8837f64d0bc
push id44108
push userarchaeopteryx@coole-files.de
push dateSat, 04 Feb 2017 12:49:41 +0000
reviewersRyanVM
bugs1336712
milestone54.0a1
Bug 1336712 - Drop test annotations and checks for Windows XP, Vista OS X < 10.9 and Android Gingerbread (2.3): browser. r?RyanVM MozReview-Commit-ID: Lezd2oHSox9
browser/components/migration/tests/unit/xpcshell.ini
browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
--- a/browser/components/migration/tests/unit/xpcshell.ini
+++ b/browser/components/migration/tests/unit/xpcshell.ini
@@ -8,17 +8,17 @@ support-files =
 
 [test_automigration.js]
 [test_Chrome_cookies.js]
 skip-if = os != "mac" # Relies on ULibDir
 [test_Chrome_passwords.js]
 skip-if = os != "win"
 [test_Edge_availability.js]
 [test_Edge_db_migration.js]
-skip-if = os != "win" || os_version == "5.1" || os_version == "5.2" # Relies on post-XP bits of ESEDB
+skip-if = os != "win"
 [test_fx_telemetry.js]
 [test_IE_bookmarks.js]
 skip-if = os != "win"
 [test_IE_cookies.js]
 skip-if = os != "win"
 [test_IE7_passwords.js]
 skip-if = os != "win"
 [test_Safari_bookmarks.js]
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
@@ -98,22 +98,18 @@ this.Screenshot = {
         let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
         file.initWithPath("/usr/sbin/screencapture");
 
         let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
         process.init(file);
 
         // Run the process.
         let args = ["-x", "-t", "png"];
-        // Darwin version number for OS X 10.6 is 10.x
-        if (windowID && Services.sysinfo.getProperty("version").indexOf("10.") !== 0) {
-          // Capture only that window on 10.7+
-          args.push("-l");
-          args.push(windowID);
-        }
+        args.push("-l");
+        args.push(windowID);
         args.push(filename);
         process.runAsync(args, args.length, this._processObserver(resolve, reject));
       });
     };
 
     function readWindowID() {
       let decoder = new TextDecoder();
       let promise = OS.File.read("/tmp/mozscreenshots-windowid");