Fix msvc_query_version_toolset function test in vcTests.py

Changes:
* Add function to return msvc version and toolset version pairs for all installed vcs.
* Construct set of installed toolset vcs for determining if msvc_query_version_toolset should raise an exception.

Author: jcbrill

SCons/Tool/MSCommon/vc.py

@@ -2570,6 +2570,34 @@ def msvc_toolset_versions_spectre(msvc_version=None, vswhere_exe=None):
     rval = MSVC.ScriptArguments._msvc_toolset_versions_spectre_internal(msvc_version, vc_dir)
     return rval
 
+def get_installed_vcs_toolsets_components(env=None):
+
+    vcs = get_installed_vcs(env)
+
+    msvc_toolset_component_defs = []
+
+    for msvc_version in vcs:
+        msvc_version_def = MSVC.Util.msvc_version_components(msvc_version)
+        if msvc_version_def.msvc_vernum > 14.0:
+            # VS2017 and later
+            toolset_all_list = msvc_toolset_versions(msvc_version=msvc_version, full=True, sxs=True)
+            for toolset_version in toolset_all_list:
+                debug('msvc_version=%s, toolset_version=%s', repr(msvc_version), repr(toolset_version))
+                toolset_version_def = MSVC.Util.msvc_extended_version_components(toolset_version)
+                if not toolset_version_def:
+                    continue
+                rval = (msvc_version_def, toolset_version_def)
+                msvc_toolset_component_defs.append(rval)
+        else:
+            # VS2015 and earlier
+            toolset_version = msvc_version_def.msvc_verstr
+            debug('msvc_version=%s, toolset_version=%s', repr(msvc_version), repr(toolset_version))
+            toolset_version_def = MSVC.Util.msvc_extended_version_components(toolset_version)
+            rval = (msvc_version_def, toolset_version_def)
+            msvc_toolset_component_defs.append(rval)
+
+    return msvc_toolset_component_defs
+
 def msvc_query_version_toolset(version=None, prefer_newest: bool=True, vswhere_exe=None):
     """
     Return an msvc version and a toolset version given a version
@@ -2616,13 +2644,13 @@ def msvc_query_version_toolset(version=None, prefer_newest: bool=True, vswhere_e
     """
     debug('version=%s, prefer_newest=%s', repr(version), repr(prefer_newest))
 
+    _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe)
+
     msvc_version = None
     msvc_toolset_version = None
 
     with MSVC.Policy.msvc_notfound_policy_contextmanager('suppress'):
 
-        _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe)
-
         vcs = get_installed_vcs()
 
         if not version:

SCons/Tool/MSCommon/vcTests.py

@@ -237,6 +237,12 @@ class Data:
     INSTALLED_VCS = MSCommon.vc.get_installed_vcs()
     INSTALLED_VCS_COMPONENTS = MSCommon.vc.get_installed_vcs_components()
 
+    INSTALLED_VCS_TOOLSETS_COMPONENTS = MSCommon.vc.get_installed_vcs_toolsets_components()
+    INSTALLED_VCS_TOOLSETS = set()
+    for msvc_version_def, toolset_version_def in INSTALLED_VCS_TOOLSETS_COMPONENTS:
+        INSTALLED_VCS_TOOLSETS.add(msvc_version_def.msvc_version)
+        INSTALLED_VCS_TOOLSETS.add(toolset_version_def.msvc_version)
+
     @classmethod
     def query_version_list(cls, vcver):
         # VS 2022 (14.3) can have either/both toolset versions 14.3X and 14.4X
@@ -498,7 +504,7 @@ def test_valid_default_msvc(self) -> None:
 
     def test_valid_vcver(self) -> None:
         for symbol in MSCommon.vc._VCVER:
-            have_msvc = bool(symbol in Data.INSTALLED_VCS)
+            have_msvc = bool(symbol in Data.INSTALLED_VCS_TOOLSETS)
             version_def = MSCommon.msvc_version_components(symbol)
             for prefer_newest in (True, False):
                 if not have_msvc: