2 files changed, 100 insertions, 1 deletions
diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py
index f1fb961..6d18d07 100644
--- a/SCons/Tool/MSCommon/MSVC/WinSDK.py
+++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py
@@ -199,7 +199,6 @@ def _verify_sdk_dispatch_map():
     return None
 
 def _version_list_sdk_map(version_list):
-
     sdk_map_list = []
     for version in version_list:
         func, reg_version = _sdk_dispatch_map[version]
@@ -237,6 +236,10 @@ def get_msvc_sdk_version_list(msvc_version, msvc_uwp_app=False):
     sdk_versions = []
 
     verstr = Util.get_msvc_version_prefix(msvc_version)
+    if not verstr:
+        debug('msvc_version is not defined')
+        return sdk_versions
+
     vs_def = Config.MSVC_VERSION_EXTERNAL.get(verstr, None)
     if not vs_def:
         debug('vs_def is not defined')
diff --git a/SCons/Tool/MSCommon/MSVC/WinSDKTests.py b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py
new file mode 100644
index 0000000..d8ede1e
--- /dev/null
+++ b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py
@@ -0,0 +1,96 @@
+# MIT License
+#
+# Copyright The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+Test Windows SDK functions for Microsoft Visual C/C++.
+"""
+
+import unittest
+
+from SCons.Tool.MSCommon.MSVC import Config
+from SCons.Tool.MSCommon.MSVC import WinSDK
+from SCons.Tool.MSCommon.MSVC import Registry
+from SCons.Tool.MSCommon.MSVC.Exceptions import MSVCInternalError
+
+_REGISTRY_SDK_QUERY_PATHS = Registry.sdk_query_paths
+
+def registry_sdk_query_paths(version):
+    # return duplicate sdk version roots
+    sdk_roots = _REGISTRY_SDK_QUERY_PATHS(version)
+    if sdk_roots:
+        sdk_roots = sdk_roots + sdk_roots
+    return sdk_roots
+
+Registry.sdk_query_paths = registry_sdk_query_paths
+
+class WinSDKTests(unittest.TestCase):
+
+    def test_verify(self):
+        _MSVC_SDK_VERSIONS = Config.MSVC_SDK_VERSIONS
+        msvc_sdk_versions = set(Config.MSVC_SDK_VERSIONS)
+        msvc_sdk_versions.add('99.0')
+        Config.MSVC_SDK_VERSIONS = msvc_sdk_versions
+        with self.assertRaises(MSVCInternalError):
+            WinSDK.verify()
+        Config.MSVC_SDK_VERSIONS = _MSVC_SDK_VERSIONS
+
+    def _run_reset(self):
+        WinSDK.reset()
+        self.assertFalse(WinSDK._sdk_map_cache, "WinSDK._sdk_map_cache was not reset")
+        self.assertFalse(WinSDK._sdk_cache, "WinSDK._sdk_cache was not reset")
+
+    def _run_get_msvc_sdk_version_list(self):
+        for vcver in Config.MSVC_VERSION_SUFFIX.keys():
+            for msvc_uwp_app in (True, False):
+                _ = WinSDK.get_msvc_sdk_version_list(vcver, msvc_uwp_app=msvc_uwp_app)
+
+    def _run_version_list_sdk_map(self):
+        for vcver in Config.MSVC_VERSION_SUFFIX.keys():
+            vs_def = Config.MSVC_VERSION_SUFFIX.get(vcver)
+            if not vs_def.vc_sdk_versions:
+                continue
+            _ = WinSDK._version_list_sdk_map(vs_def.vc_sdk_versions)
+
+    def test_version_list_sdk_map(self):
+        self._run_version_list_sdk_map()
+        self._run_version_list_sdk_map()
+        self.assertTrue(WinSDK._sdk_map_cache, "WinSDK._sdk_map_cache is empty")
+
+    def test_get_msvc_sdk_version_list(self):
+        self._run_get_msvc_sdk_version_list()
+        self._run_get_msvc_sdk_version_list()
+        self.assertTrue(WinSDK._sdk_cache, "WinSDK._sdk_cache is empty")
+
+    def test_get_msvc_sdk_version_list_empty(self):
+        for vcver in [None, '', '99', '99.9']:
+            sdk_versions = WinSDK.get_msvc_sdk_version_list(vcver)
+            self.assertFalse(sdk_versions, "sdk_versions list was not empty for msvc version {}".format(
+                repr(vcver)
+            ))
+
+    def test_reset(self):
+        self._run_reset()
+
+if __name__ == "__main__":
+    unittest.main()
+