Backed out 3 changesets (bug 1512286)for breaking test because of missing option CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Fri, 07 Dec 2018 16:51:59 +0200
changeset 508820 5ae509e2f3b638ca15e14cad8441a3cf75ad4647
parent 508819 c7443dbcd479b1530466b3d04bba05dc93f4132a
child 508821 a7f0acc59459f4a2be7d2b5edd8436081b5bbcf2
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1512286
milestone65.0a1
backs outcd601d93d9f39d7ec1194d77686db1984a2ee708
929fe0acd506fb4fd72db89915dbc49c015a252f
e1b3f3624b87b0ae2a4719ef9df36c3ffe6aa391
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
Backed out 3 changesets (bug 1512286)for breaking test because of missing option CLOSED TREE Backed out changeset cd601d93d9f3 (bug 1512286) Backed out changeset 929fe0acd506 (bug 1512286) Backed out changeset e1b3f3624b87 (bug 1512286)
gfx/thebes/gfxPlatform.cpp
taskcluster/ci/test/awsy.yml
taskcluster/taskgraph/transforms/tests.py
testing/mozharness/scripts/awsy_script.py
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2552,21 +2552,16 @@ void gfxPlatform::InitCompositorAccelera
          gfxPrefs::WebRenderEnabledDoNotUseDirectly();
 }
 
 /*static*/ bool gfxPlatform::WebRenderEnvvarEnabled() {
   const char* env = PR_GetEnv("MOZ_WEBRENDER");
   return (env && *env == '1');
 }
 
-static bool WebRenderEnvvarDisabled() {
-  const char* env = PR_GetEnv("MOZ_WEBRENDER");
-  return (env && *env == '0');
-}
-
 // If the "gfx.webrender.all.qualified" pref is true we want to enable
 // WebRender for qualifying hardware. The Normandy pref rollout code sets
 // default values on rolled out prefs on every startup, but Gfx starts up
 // before Normandy does. So it's too early to observe the WR qualified pref
 // default value changed by Normandy rollout here yet. So we have a shutdown
 // observer to save the default value on shutdown, and read the saved default
 // value here instead, and emulate the behavior of the pref system, with
 // respect to default/user values of the rollout pref.
@@ -2722,17 +2717,17 @@ void gfxPlatform::InitWebRenderConfig() 
       featureWebRender.ForceDisable(FeatureStatus::Blocked,
                                     "Qualified enable blocked", failureId);
     }
   }
 
   // If the user set the pref to force-disable, let's do that. This will
   // override all the other enabling prefs (gfx.webrender.enabled,
   // gfx.webrender.all, and gfx.webrender.all.qualified).
-  if (gfxPrefs::WebRenderForceDisabled() || WebRenderEnvvarDisabled()) {
+  if (gfxPrefs::WebRenderForceDisabled()) {
     featureWebRender.UserDisable(
         "User force-disabled WR",
         NS_LITERAL_CSTRING("FEATURE_FAILURE_USER_FORCE_DISABLED"));
   }
 
   // HW_COMPOSITING being disabled implies interfacing with the GPU might break
   if (!gfxConfig::IsEnabled(Feature::HW_COMPOSITING)) {
     featureWebRender.ForceDisable(
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@@ -1,16 +1,15 @@
 job-defaults:
     suite: awsy
     max-run-time: 7200
     instance-size: xlarge
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
-            windows10-64/.*: virtual-with-gpu
             default: virtual
     allow-software-gl-layers: false
     mozharness:
         script: awsy_script.py
         config:
             by-test-platform:
                 windows.*:
                     - awsy/taskcluster_windows_config.py
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -950,19 +950,16 @@ def enable_webrender(config, tests):
     """
     Handle the "webrender" property by passing a flag to mozharness if it is
     enabled.
     """
     for test in tests:
         if test.get('webrender'):
             test['mozharness'].setdefault('extra-options', [])\
                               .append("--enable-webrender")
-        else:
-            test['mozharness'].setdefault('extra-options', [])\
-                              .append("--disable-webrender")
 
         yield test
 
 
 @transforms.add
 def set_retry_exit_status(config, tests):
     """Set the retry exit status to TBPL_RETRY, the value returned by mozharness
        scripts to indicate a transient failure that should be retried."""
--- a/testing/mozharness/scripts/awsy_script.py
+++ b/testing/mozharness/scripts/awsy_script.py
@@ -46,22 +46,16 @@ class AWSY(TestingMixin, MercurialScript
           "help": "Set STYLO_THREADS=1.",
           }],
         [["--enable-webrender"],
          {"action": "store_true",
           "dest": "enable_webrender",
           "default": False,
           "help": "Tries to enable the WebRender compositor.",
           }],
-        [["--disable-webrender"],
-         {"action": "store_true",
-          "dest": "disable_webrender",
-          "default": False,
-          "help": "Force-disables the WebRender compositor.",
-          }],
         [["--base"],
          {"action": "store_true",
           "dest": "test_about_blank",
           "default": False,
           "help": "Runs the about:blank base case memory test.",
           }],
         [["--dmd"],
          {"action": "store_true",
@@ -233,21 +227,16 @@ class AWSY(TestingMixin, MercurialScript
 
         # TODO: consider getting rid of this as stylo is enabled by default
         env['STYLO_FORCE_ENABLED'] = '1'
 
         if self.config['enable_webrender']:
             env['MOZ_WEBRENDER'] = '1'
             env['MOZ_ACCELERATED'] = '1'
 
-        # Allow explicitly disabling webrender, so that we don't run WR on non-QR
-        # test platforms just because they run on qualified hardware.
-        if self.config['disable_webrender']:
-            env['MOZ_WEBRENDER'] = '0'
-
         env['MOZ_UPLOAD_DIR'] = dirs['abs_blob_upload_dir']
         if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
             self.mkdir_p(env['MOZ_UPLOAD_DIR'])
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         env['MINIDUMP_SAVE_PATH'] = dirs['abs_blob_upload_dir']
         env['RUST_BACKTRACE'] = '1'
         env = self.query_env(partial_env=env)