diff options
Diffstat (limited to 'layout/tools')
| -rw-r--r-- | layout/tools/reftest/mach_commands.py | 4 | ||||
| -rw-r--r-- | layout/tools/reftest/manifest.sys.mjs | 3 | ||||
| -rw-r--r-- | layout/tools/reftest/reftest.sys.mjs | 4 | ||||
| -rw-r--r-- | layout/tools/reftest/runreftest.py | 19 |
4 files changed, 9 insertions, 21 deletions
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py index 8cb1164332..dd4c8ea63a 100644 --- a/layout/tools/reftest/mach_commands.py +++ b/layout/tools/reftest/mach_commands.py @@ -160,10 +160,6 @@ class ReftestRunner(MozbuildObject): args.e10s = False print("using e10s=False for non-geckoview app") - # Disable fission until geckoview supports fission by default. - # Need fission on Android? Use '--setpref fission.autostart=true' - args.disableFission = True - # A symlink and some path manipulations are required so that test # manifests can be found both locally and remotely (via a url) # using the same relative path. diff --git a/layout/tools/reftest/manifest.sys.mjs b/layout/tools/reftest/manifest.sys.mjs index 4be0afde57..a4a8ed126f 100644 --- a/layout/tools/reftest/manifest.sys.mjs +++ b/layout/tools/reftest/manifest.sys.mjs @@ -677,6 +677,9 @@ function BuildConditionSandbox(aURL) { sandbox.d2d && sandbox.gpuProcess; + sandbox.mozinfo = Services.prefs.getStringPref("sandbox.mozinfo", null); + sandbox.os_version = sandbox.mozinfo.os_version; + sandbox.layersGPUAccelerated = g.windowUtils.layerManagerType != "Basic"; sandbox.d3d11 = g.windowUtils.layerManagerType == "Direct3D 11"; sandbox.d3d9 = g.windowUtils.layerManagerType == "Direct3D 9"; diff --git a/layout/tools/reftest/reftest.sys.mjs b/layout/tools/reftest/reftest.sys.mjs index 1040470967..0f103c5816 100644 --- a/layout/tools/reftest/reftest.sys.mjs +++ b/layout/tools/reftest/reftest.sys.mjs @@ -1423,7 +1423,9 @@ function RecordResult(testRunTime, errorMsg, typeSpecificResults) { // branch, 'equal' must be false so let's assert that to guard // against logic errors. if (equal) { - throw new Error("Logic error in reftest.jsm fuzzy test handling!"); + throw new Error( + "Logic error in reftest.sys.mjs fuzzy test handling!" + ); } output = { s: ["PASS", "FAIL"], n: "UnexpectedPass" }; } else { diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index cf314c99b5..e97a6de5d7 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -462,6 +462,9 @@ class RefTest(object): # config specific flags prefs["sandbox.apple_silicon"] = mozinfo.info.get("apple_silicon", False) + prefs["sandbox.mozinfo"] = json.dumps(mozinfo.info) + prefs["sandbox.os_version"] = mozinfo.info.get("os_version", "") + # Set tests to run or manifests to parse. if tests: testlist = os.path.join(profile.profile, "reftests.json") @@ -482,22 +485,6 @@ class RefTest(object): if options.thisChunk: prefs["reftest.thisChunk"] = options.thisChunk - # Bug 1262954: For winXP + e10s disable acceleration - if ( - platform.system() in ("Windows", "Microsoft") - and "5.1" in platform.version() - and options.e10s - ): - prefs["layers.acceleration.disabled"] = True - - # Bug 1300355: Disable canvas cache for win7 as it uses - # too much memory and causes OOMs. - if ( - platform.system() in ("Windows", "Microsoft") - and "6.1" in platform.version() - ): - prefs["reftest.nocache"] = True - if options.marionette: # options.marionette can specify host:port port = options.marionette.split(":")[1] |