Fixup for broken tests when combining bug 1485224 from inbound and bug 1490549 from autoland. r=me,a=build-bustage-fix
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 15 Sep 2018 20:01:39 +0900
changeset 492260 e088bb62f286
parent 492259 73a2f427e2fd
child 492261 e1a681345945
child 492267 4de3746f7817
child 492284 b72bd58ebc81
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, build-bustage-fix
bugs1485224, 1490549
milestone64.0a1
first release with
nightly linux32
e088bb62f286 / 64.0a1 / 20180915115425 / files
nightly linux64
e088bb62f286 / 64.0a1 / 20180915115425 / files
nightly win32
e088bb62f286 / 64.0a1 / 20180915115425 / files
nightly win64
e088bb62f286 / 64.0a1 / 20180915115425 / files
nightly mac
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly win32
nightly win64
Fixup for broken tests when combining bug 1485224 from inbound and bug 1490549 from autoland. r=me,a=build-bustage-fix
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -1493,22 +1493,22 @@ class OSXCrossToolchainTest(BaseToolchai
 
 class WindowsCrossToolchainTest(BaseToolchainTest):
     TARGET = 'x86_64-pc-mingw32'
     DEFAULT_CLANG_RESULT = LinuxToolchainTest.DEFAULT_CLANG_RESULT
     DEFAULT_CLANGXX_RESULT = LinuxToolchainTest.DEFAULT_CLANGXX_RESULT
 
     def test_wsl_cross(self):
         paths = {
-            '/usr/bin/cl': VS_2017u6 + VS_PLATFORM_X86_64,
+            '/usr/bin/cl': VS_2017u8 + VS_PLATFORM_X86_64,
         }
         paths.update(LinuxToolchainTest.PATHS)
         self.do_toolchain_test(paths, {
-            'c_compiler': WindowsToolchainTest.VS_2017u6_RESULT,
-            'cxx_compiler': WindowsToolchainTest.VSXX_2017u6_RESULT,
+            'c_compiler': WindowsToolchainTest.VS_2017u8_RESULT,
+            'cxx_compiler': WindowsToolchainTest.VSXX_2017u8_RESULT,
             'host_c_compiler': self.DEFAULT_CLANG_RESULT,
             'host_cxx_compiler': self.DEFAULT_CLANGXX_RESULT,
         })
 
     def test_clang_cl_cross(self):
         paths = {
             '/usr/bin/clang-cl': CLANG_CL_3_9 + CLANG_CL_PLATFORM_X86_64,
         }