Reimplement test for new parameter as Python test

Also take the chance to rename a function for clarity

Author: edymtt

utils/swift_build_support/swift_build_support/products/swift.py

@@ -61,9 +61,9 @@ def __init__(self, args, toolchain, source_dir, build_dir):
 
         # Add experimental string processing flag.
         self.cmake_options.extend(self._enable_experimental_string_processing)
-        
+
         # Add freestanding related flags.
-        self.cmake_options.extend(self._enable_freestanding_is_darwin)
+        self.cmake_options.extend(self._freestanding_is_darwin)
 
     @classmethod
     def is_build_script_impl_product(cls):
@@ -173,9 +173,9 @@ def _enable_stdlib_static_vprintf(self):
     def _enable_experimental_string_processing(self):
         return [('SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING:BOOL',
                  self.args.enable_experimental_string_processing)]
-    
+
     @property
-    def _enable_freestanding_is_darwin(self):
+    def _freestanding_is_darwin(self):
         return [('SWIFT_FREESTANDING_IS_DARWIN:BOOL',
                  self.args.swift_freestanding_is_darwin)]
 

utils/swift_build_support/tests/products/test_swift.py

@@ -62,7 +62,8 @@ def setUp(self):
             enable_experimental_concurrency=False,
             enable_experimental_distributed=False,
             build_swift_stdlib_static_print=False,
-            enable_experimental_string_processing=False)
+            enable_experimental_string_processing=False,
+            swift_freestanding_is_darwin=False)
 
         # Setup shell
         shell.dry_run = True
@@ -97,7 +98,8 @@ def test_by_default_no_cmake_options(self):
             '-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
-            '-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING:BOOL=FALSE'
+            '-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING:BOOL=FALSE',
+            '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
         ]
         self.assertEqual(set(swift.cmake_options), set(expected))
 
@@ -117,7 +119,8 @@ def test_swift_runtime_tsan(self):
             '-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=FALSE',
             '-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=FALSE',
             '-DSWIFT_STDLIB_STATIC_PRINT=FALSE',
-            '-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING:BOOL=FALSE'
+            '-DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING:BOOL=FALSE',
+            '-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
         ]
         self.assertEqual(set(swift.cmake_options), set(flags_set))
 
@@ -369,3 +372,16 @@ def test_experimental_string_processing_flags(self):
              'TRUE'],
             [x for x in swift.cmake_options
              if 'DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING' in x])
+
+    def test_freestanding_is_darwin_flags(self):
+        self.args.swift_freestanding_is_darwin = True
+        swift = Swift(
+            args=self.args,
+            toolchain=self.toolchain,
+            source_dir='/path/to/src',
+            build_dir='/path/to/build')
+        self.assertEqual(
+            ['-DSWIFT_FREESTANDING_IS_DARWIN:BOOL='
+             'TRUE'],
+            [x for x in swift.cmake_options
+                if 'SWIFT_FREESTANDING_IS_DARWIN' in x])