gh-124111: Keep tests passing for Tcl prior to 9.0 (GH-150102)

Also disables the UWP build in CI, since it was breaking (and is no longer released).

diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
index 4c8d0c8a2f984fce7cfd44f044d0034b6a6a189a..c6e8128884e90c250c1b7cbf9dc47e06204de5b3 100644 (file)
--- a/.github/workflows/reusable-windows.yml
+++ b/.github/workflows/reusable-windows.yml
@@ -22,8 +22,6 @@ permissions:
 
 env:
   FORCE_COLOR: 1
-  IncludeUwp: >-
-    true
 
 jobs:
   build:

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 81a5477b496b5c21e994e96b0a3b0ebf5010241e..70731d3222ced94126b386669980998fd9d32641 100644 (file)
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -55,7 +55,7 @@ class TclTest(unittest.TestCase):
     def test_eval_surrogates_in_result(self):
         tcl = self.interp
         result = tcl.eval(r'set a "<\ud83d\udcbb>"')
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' and tcl_version >= (9, 0):
             self.assertEqual('<\ud83d\udcbb>', result)
         else:
             self.assertEqual('<\U0001f4bb>', result)
@@ -294,7 +294,7 @@ class TclTest(unittest.TestCase):
             """)
         tcl.evalfile(filename)
         result = tcl.eval('set b')
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' and tcl_version >= (9, 0):
             self.assertEqual('<\ud83d\udcbb>', result)
         else:
             self.assertEqual('<\U0001f4bb>', result)