diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py index 4e628ed8f6ce..f266e866c44d 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py @@ -10,7 +10,6 @@ config = { 'stage_platform': 'win32-add-on-devel', #### 32 bit build specific ##### 'env': { - 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_CRASHREPORTER_NO_REPORT': '1', diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py index 67c1bad26e13..bd44aab97d33 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py @@ -11,7 +11,6 @@ config = { 'debug_build': True, #### 32 bit build specific ##### 'env': { - 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_CRASHREPORTER_NO_REPORT': '1', diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py index 2d73b8f0a77d..dc9518cb0c5e 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py @@ -14,7 +14,6 @@ releng.manifest", 'perfherder_extra_options': ['static-analysis'], #### 32 bit build specific ##### 'env': { - 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_CRASHREPORTER_NO_REPORT': '1', diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py index 490c34d5c370..a49d8d23861a 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py @@ -10,7 +10,6 @@ config = { 'stage_platform': 'win64-add-on-devel', #### 64 bit build specific ##### 'env': { - 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py index 4423346c5cfd..083696d5ae32 100644 --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py @@ -11,7 +11,6 @@ config = { 'debug_build': True, #### 64 bit build specific ##### 'env': { - 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git a/testing/mozharness/configs/builds/taskcluster_base_win32.py b/testing/mozharness/configs/builds/taskcluster_base_win32.py index 8f9594e68984..a71a435b00cb 100644 --- a/testing/mozharness/configs/builds/taskcluster_base_win32.py +++ b/testing/mozharness/configs/builds/taskcluster_base_win32.py @@ -4,9 +4,6 @@ config = { 'base_name': 'WINNT_5.2_%(branch)s', 'platform': 'win32', 'env': { - 'BINSCOPE': os.path.join( - os.environ['ProgramFiles(x86)'], 'Microsoft', 'SDL BinScope', 'BinScope.exe' - ), 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x86/srcsrv/pdbstr.exe', }, "check_test_env": { diff --git a/testing/mozharness/configs/builds/taskcluster_base_windows.py b/testing/mozharness/configs/builds/taskcluster_base_windows.py index ea4c6b5cafe6..889b20a3043b 100644 --- a/testing/mozharness/configs/builds/taskcluster_base_windows.py +++ b/testing/mozharness/configs/builds/taskcluster_base_windows.py @@ -12,6 +12,9 @@ config = { 'max_build_output_timeout': 60 * 80, 'env': { + 'BINSCOPE': os.path.join( + os.environ['ProgramFiles'], 'Microsoft BinScope 2014', 'Binscope.exe' + ), 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'), 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_CRASHREPORTER_NO_REPORT': '1',