Backed out changeset 664fd8f4cc02 (bug 1533282) for causing a wrench bustage CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Thu, 07 Mar 2019 19:17:34 +0200
changeset 520855 6490553fc843801070935e47e715e64ff0071615
parent 520854 02fe822afa8c6252970f779dcbfd4a7b57fefd13
child 520856 7a1c873a21b22134a1741db7b88268de2869263f
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1533282
milestone67.0a1
backs out664fd8f4cc02b58208f2e49b7c8aac0aac9a1e09
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 changeset 664fd8f4cc02 (bug 1533282) for causing a wrench bustage CLOSED TREE
gfx/wr/wrench/script/headless.py
--- a/gfx/wr/wrench/script/headless.py
+++ b/gfx/wr/wrench/script/headless.py
@@ -43,35 +43,16 @@ def is_windows():
 
 def is_macos():
     return sys.platform == 'darwin'
 
 
 def is_linux():
     return sys.platform.startswith('linux')
 
-def debugger():
-    if "DEBUGGER" in os.environ:
-        return os.environ["DEBUGGER"]
-    return None
-
-
-def use_gdb():
-    return debugger() in ['gdb', 'cgdb', 'rust-gdb']
-
-
-def use_rr():
-    return debugger() == 'rr'
-
-
-def optimized_build():
-    if "OPTIMIZED" in os.environ:
-        opt = os.environ["OPTIMIZED"]
-        return opt not in ["0", "false"]
-    return True
 
 def set_osmesa_env(bin_path):
     """Set proper LD_LIBRARY_PATH and DRIVE for software rendering on Linux and OSX"""
     if is_linux():
         osmesa_path = path.join(find_dep_path_newest('osmesa-src', bin_path), "out", "lib", "gallium")
         print(osmesa_path)
         os.environ["LD_LIBRARY_PATH"] = osmesa_path
         os.environ["GALLIUM_DRIVER"] = "softpipe"
@@ -86,38 +67,15 @@ def set_osmesa_env(bin_path):
 
 target_folder = os.getenv('WRENCH_HEADLESS_TARGET', None)
 if not target_folder:
     extra_flags = os.getenv('CARGOFLAGS', None)
     extra_flags = extra_flags.split(' ') if extra_flags else []
     subprocess.check_call(['cargo', 'build'] + extra_flags + ['--release', '--verbose', '--features', 'headless'])
     target_folder = '../target/'
 
-build_cmd = ['cargo', 'build'] + extra_flags + ['--verbose', '--features', 'headless']
-if optimized_build():
-    build_cmd += ['--release']
-
-if optimized_build():
-    target_folder += 'release/'
-else:
-    target_folder += 'debug/'
-
-subprocess.check_call(build_cmd)
-
-dbg_cmd = []
-if use_rr():
-    dbg_cmd = ['rr', 'record']
-elif use_gdb():
-    dbg_cmd = [debugger(), '--args']
-elif debugger():
-    print("Unknown debugger: " + debugger())
-    sys.exit(1)
-
-set_osmesa_env(target_folder)
+set_osmesa_env(target_folder + 'release/')
 # TODO(gw): We have an occasional accuracy issue or bug (could be WR or OSMesa)
 #           where the output of a previous test that uses intermediate targets can
 #           cause 1.0 / 255.0 pixel differences in a subsequent test. For now, we
 #           run tests with no-scissor mode, which ensures a complete target clear
 #           between test runs. But we should investigate this further...
-cmd = dbg_cmd + [target_folder + 'wrench', '--no-scissor', '-h'] + sys.argv[1:]
-print('Running: `' + ' '.join(cmd) + '`')
-subprocess.check_call(cmd)
-
+subprocess.check_call([target_folder + 'release/wrench', '--no-scissor', '-h'] + sys.argv[1:])