[build-script] Fix swift-driver options and test thereof

Author: DougGregor

utils/build_swift/build_swift/driver_arguments.py

@@ -1015,7 +1015,7 @@ def create_argument_parser():
 
     option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
            help='skip testing swiftpm')
-    option('--skip-test-swiftdriver', toggle_false('test_swift_driver'),
+    option('--skip-test-swift-driver', toggle_false('test_swift_driver'),
            help='skip testing Swift driver')
     option('--skip-test-swiftsyntax', toggle_false('test_swiftsyntax'),
            help='skip testing SwiftSyntax')

utils/build_swift/tests/expected_options.py

@@ -89,6 +89,7 @@
     'build_swift_static_stdlib': False,
     'build_swift_stdlib_unittest_extra': False,
     'build_swiftpm': False,
+    'build_swift_driver': False,
     'build_swiftsyntax': False,
     'build_tensorflow_swift_apis': False,
     'build_libparser_only': False,
@@ -99,6 +100,7 @@
     'test_sourcekitlsp_sanitize_all': False,
     'build_sourcekitlsp': False,
     'install_swiftpm': False,
+    'install_swift_driver': False,
     'install_swiftsyntax': False,
     'swiftsyntax_verify_generated_files': False,
     'install_playgroundsupport': False,
@@ -230,6 +232,7 @@
     'test_watchos_simulator': False,
     'test_playgroundsupport': True,
     'test_swiftpm': False,
+    'test_swift_driver': False,
     'test_swiftsyntax': False,
     'test_indexstoredb': False,
     'test_sourcekitlsp': False,
@@ -473,6 +476,7 @@ class BuildScriptImplOption(_BaseOption):
                   dest='install_tensorflow_swift_apis'),
     SetTrueOption('--skip-build'),
     SetTrueOption('--swiftpm', dest='build_swiftpm'),
+    SetTrueOption('--swift-driver', dest='build_swift_driver'),
     SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
     SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
     SetTrueOption('--skstresstester', dest='build_skstresstester'),
@@ -523,6 +527,7 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--swiftsyntax-verify-generated-files',
                  dest='swiftsyntax_verify_generated_files'),
     EnableOption('--install-swiftpm', dest='install_swiftpm'),
+    EnableOption('--install-swift-driver', dest='install_swift_driver'),
     EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--install-skstresstester', dest='install_skstresstester'),
     EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
@@ -588,6 +593,7 @@ class BuildScriptImplOption(_BaseOption):
     DisableOption('--skip-test-playgroundsupport',
                   dest='test_playgroundsupport'),
     DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
+    DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
     DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),
     DisableOption('--skip-test-indexstore-db', dest='test_indexstoredb'),
     DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'),