Bug 1401287 - Skip sandbox check for test plug-in on Android; r=dbaron
authorGeoff Brown <gbrown@mozilla.com>
Fri, 22 Sep 2017 11:32:40 -0600
changeset 382568 a130f9b289dfd85efc1cde484f892dc53cd5086c
parent 382567 18028ed94381c0c45ee68c5834a96cd087d62521
child 382569 5d42f8d147c677923fb04ed83a7e41e9a27d4c91
push id32562
push userarchaeopteryx@coole-files.de
push dateSat, 23 Sep 2017 09:38:29 +0000
treeherdermozilla-central@8db0c4ecd94c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1401287
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1401287 - Skip sandbox check for test plug-in on Android; r=dbaron The test plugins - dom/plugins/test/testplugin - are not built on Android. By assuming that the test plugin is not available on Android, a per-manifest check and warning can be avoided.
layout/tools/reftest/reftest.jsm
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -800,17 +800,17 @@ function BuildConditionSandbox(aURL) {
     // for other platforms.  The integer is formed by 100 times the
     // major version plus the minor version, so 1006 for 10.6, 1010 for
     // 10.10, etc.
     var osxmatch = /Mac OS X (\d+).(\d+)$/.exec(hh.oscpu);
     sandbox.OSX = osxmatch ? parseInt(osxmatch[1]) * 100 + parseInt(osxmatch[2]) : undefined;
 
     // see if we have the test plugin available,
     // and set a sandox prop accordingly
-    sandbox.haveTestPlugin = !!getTestPlugin("Test Plug-in");
+    sandbox.haveTestPlugin = !sandbox.Android && !!getTestPlugin("Test Plug-in");
 
     // Set a flag on sandbox if the windows default theme is active
     sandbox.windowsDefaultTheme = gContainingWindow.matchMedia("(-moz-windows-default-theme)").matches;
 
     try {
         sandbox.nativeThemePref = !prefs.getBoolPref("mozilla.widget.disable-native-theme");
     } catch (e) {
         sandbox.nativeThemePref = true;