Fix Python tests for new build flag

Author: Catfish-Man

utils/build_swift/build_swift/driver_arguments.py

@@ -985,10 +985,11 @@ def create_argument_parser():
 
     option('--build-swift-stdlib-static-print', toggle_true,
            help='Build constant_vprintf support')
-           
+
     option('--build-swift-stdlib-unicode-data', toggle_true,
            default=True,
-           help='Include Unicode data in the standard library. Note: required for full String functionality')
+           help='Include Unicode data in the standard library.'
+                'Note: required for full String functionality')
 
     option(['-S', '--skip-build'], store_true,
            help='generate build directory only without building')

utils/build_swift/tests/expected_options.py

@@ -84,6 +84,7 @@
     'build_swift_static_stdlib': False,
     'build_swift_stdlib_unittest_extra': False,
     'build_swift_stdlib_static_print': False,
+    'build_swift_stdlib_unicode_data': True,
     'build_swiftpm': False,
     'build_swift_driver': False,
     'build_early_swift_driver': True,

utils/swift_build_support/swift_build_support/products/swift.py

@@ -63,7 +63,7 @@ def __init__(self, args, toolchain, source_dir, build_dir):
         self.cmake_options.extend(self._freestanding_is_darwin)
 
         self.cmake_options.extend(self._build_swift_private_stdlib)
-        
+
         self.cmake_options.extend(self._enable_stdlib_unicode_data)
 
     @classmethod
@@ -169,7 +169,7 @@ def _enable_experimental_distributed(self):
     def _enable_stdlib_static_vprintf(self):
         return [('SWIFT_STDLIB_STATIC_PRINT',
                  self.args.build_swift_stdlib_static_print)]
-                 
+
     @property
     def _enable_stdlib_unicode_data(self):
         return [('SWIFT_STDLIB_ENABLE_UNICODE_DATA',

utils/swift_build_support/tests/products/test_swift.py

@@ -62,7 +62,7 @@ def setUp(self):
             enable_experimental_concurrency=False,
             enable_experimental_distributed=False,
             build_swift_stdlib_static_print=False,
-            stdlib_unicode_data=True,
+            build_swift_stdlib_unicode_data=True,
             swift_freestanding_is_darwin=False,
             build_swift_private_stdlib=True)
 
@@ -101,6 +101,7 @@ def test_by_default_no_cmake_options(self):
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
             '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
             '-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
+            '-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
         ]
         self.assertEqual(set(swift.cmake_options), set(expected))
 
@@ -122,6 +123,7 @@ def test_swift_runtime_tsan(self):
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
             '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
             '-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
+            '-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
         ]
         self.assertEqual(set(swift.cmake_options), set(flags_set))