Skip to content

Commit 63bdc48

Browse files
committed
SL-18837: Zap test attempting to set invalid AUTOBUILD_VSVER.
autobuild source_environment was changed to provide AUTOBUILD_WIN_VSTOOLSET for AUTOBUILD_VSVER (e.g.) "174" as well as "170". Testing that AUTOBUILD_WIN_VSTOOLSET isn't set for certain AUTOBUILD_VSVER values is no longer applicable. Moreover, attempting to set AUTOBUILD_VSVER to a Visual Studio version not installed on the host system fails autobuild validation.
1 parent 813af85 commit 63bdc48

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

tests/test_source_environment.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,9 @@ def test_config_shorthand(self):
320320

321321
@needs_cygwin
322322
def test_vstoolset_set(self):
323+
# n.b. This test will need to be updated from time to time:
324+
# AUTOBUILD_VSVER is validated against the Visual Studio versions
325+
# installed on the host system.
323326
with envvar("AUTOBUILD_VSVER", "170"):
324327
vars = self.read_variables(self.find_data("empty"))
325328
self.assertEqual(vars["AUTOBUILD_WIN_VSTOOLSET"], "v143")
326-
327-
@needs_cygwin
328-
def test_vstoolset_not_set_if_vsver_unrecognized(self):
329-
with envvar("AUTOBUILD_VSVER", "120"):
330-
vars = self.read_variables(self.find_data("empty"))
331-
self.assertTrue("AUTOBUILD_WIN_VSTOOLSET" not in vars)

0 commit comments

Comments
 (0)