Merge pull request #37852 from drexin/wip-fix-skip-test-cmark

[Build] Fix --skip-test-cmark

Author: drexin

utils/build_swift/build_swift/driver_arguments.py

@@ -183,6 +183,7 @@ def _apply_default_arguments(args):
         args.test_tvos = False
         args.test_watchos = False
         args.test_android = False
+        args.test_cmark = False
         args.test_swiftpm = False
         args.test_swift_driver = False
         args.test_swiftsyntax = False
@@ -1069,6 +1070,8 @@ def create_argument_parser():
            help='skip cleaning up swiftpm')
     option('--skip-clean-swift-driver', toggle_false('clean_swift_driver'),
            help='skip cleaning up Swift driver')
+    option('--skip-test-cmark', toggle_false('test_cmark'),
+           help='skip testing cmark')
     option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
            help='skip testing swiftpm')
     option('--skip-test-swift-driver', toggle_false('test_swift_driver'),

utils/build_swift/tests/expected_options.py

@@ -247,6 +247,7 @@
     'test_watchos_host': False,
     'test_watchos_simulator': False,
     'test_playgroundsupport': True,
+    'test_cmark': False,
     'test_swiftpm': False,
     'test_swift_driver': False,
     'test_swiftsyntax': False,
@@ -620,6 +621,7 @@ class BuildScriptImplOption(_BaseOption):
                   dest='test_watchos_simulator'),
     DisableOption('--skip-test-playgroundsupport',
                   dest='test_playgroundsupport'),
+    DisableOption('--skip-test-cmark', dest='test_cmark'),
     DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
     DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
     DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),

utils/swift_build_support/swift_build_support/products/cmark.py

@@ -86,7 +86,7 @@ def should_test(self, host_target):
         if self.is_cross_compile_target(host_target):
             return False
 
-        return self.args.test
+        return self.args.test_cmark
 
     def test(self, host_target):
         """

utils/swift_build_support/tests/products/test_cmark.py

@@ -24,7 +24,7 @@
 
 # from swift_build_support import cmake
 from swift_build_support import shell
-# from swift_build_support.products import CMark
+from swift_build_support.products import CMark
 from swift_build_support.targets import StdlibDeploymentTarget
 from swift_build_support.toolchain import host_toolchain
 from swift_build_support.workspace import Workspace
@@ -113,3 +113,31 @@ def test_build(self):
 #            cmake=self.toolchain.cmake,
 #            cmake_args=' '.join(_cmake.common_options()),
 #            build_variant=self.args.cmark_build_variant))
+
+    def test_should_test(self):
+        cmark = CMark(
+            args=argparse.Namespace(test_cmark=True, cross_compile_hosts=[]),
+            toolchain=self.toolchain,
+            source_dir=self.workspace.source_root,
+            build_dir=self.workspace.build_root)
+
+        self.assertTrue(cmark.should_test(self.host.name))
+
+    def test_should_skip_test(self):
+        cmark = CMark(
+            args=argparse.Namespace(test_cmark=False, cross_compile_hosts=[]),
+            toolchain=self.toolchain,
+            source_dir=self.workspace.source_root,
+            build_dir=self.workspace.build_root)
+
+        self.assertFalse(cmark.should_test(self.host.name))
+
+    def test_should_skip_test_cross_compile(self):
+        cmark = CMark(
+            args=argparse.Namespace(test_cmark=True,
+                                    cross_compile_hosts=[self.host.name]),
+            toolchain=self.toolchain,
+            source_dir=self.workspace.source_root,
+            build_dir=self.workspace.build_root)
+
+        self.assertFalse(cmark.should_test(self.host.name))