Add tests

Author: keith

swift/internal/compiling.bzl

@@ -877,7 +877,10 @@ def compile_action_configs(
                 swift_action_names.DUMP_AST,
             ],
             configurators = [_dependencies_swiftmodules_configurator],
-            not_features = [SWIFT_FEATURE_VFSOVERLAY],
+            not_features = [
+                [SWIFT_FEATURE_VFSOVERLAY],
+                [SWIFT_FEATURE_USE_EXPLICIT_SWIFT_MODULE_MAP],
+            ],
         ),
         swift_toolchain_config.action_config(
             actions = [
@@ -890,18 +893,6 @@ def compile_action_configs(
             ],
             features = [SWIFT_FEATURE_VFSOVERLAY],
         ),
-    ])
-
-    action_configs.extend([
-        swift_toolchain_config.action_config(
-            actions = [
-                swift_action_names.COMPILE,
-                swift_action_names.DERIVE_FILES,
-                swift_action_names.DUMP_AST,
-            ],
-            configurators = [_dependencies_swiftmodules_configurator],
-            not_features = [SWIFT_FEATURE_USE_EXPLICIT_SWIFT_MODULE_MAP],
-        ),
         swift_toolchain_config.action_config(
             actions = [
                 swift_action_names.COMPILE,

test/features_tests.bzl

@@ -38,6 +38,22 @@ file_prefix_xcode_remap_test = make_action_command_line_test_rule(
     },
 )
 
+vfsoverlay_test = make_action_command_line_test_rule(
+    config_settings = {
+        "//command_line_option:features": [
+            "swift.vfsoverlay",
+        ],
+    },
+)
+
+explicit_swift_module_map_test = make_action_command_line_test_rule(
+    config_settings = {
+        "//command_line_option:features": [
+            "swift.use_explicit_swift_module_map",
+        ],
+    },
+)
+
 def features_test_suite(name):
     """Test suite for various features.
 
@@ -47,13 +63,16 @@ def features_test_suite(name):
     default_test(
         name = "{}_default_test".format(name),
         tags = [name],
-        expected_argv = ["-emit-object"],
+        expected_argv = [
+            "-emit-object",
+            "-I$(BIN_DIR)/test/fixtures/basic",
+        ],
         not_expected_argv = [
             "-file-prefix-map",
             "-Xwrapped-swift=-file-prefix-pwd-is-dot",
         ],
         mnemonic = "SwiftCompile",
-        target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
+        target_under_test = "@build_bazel_rules_swift//test/fixtures/basic:second",
     )
 
     file_prefix_map_test(
@@ -95,3 +114,33 @@ def features_test_suite(name):
         mnemonic = "SwiftCompile",
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
     )
+
+    vfsoverlay_test(
+        name = "{}_vfsoverlay_test".format(name),
+        tags = [name],
+        expected_argv = [
+            "-Xfrontend -vfsoverlay$(BIN_DIR)/test/fixtures/basic/second.vfsoverlay.yaml",
+            "-I/__build_bazel_rules_swift/swiftmodules",
+        ],
+        not_expected_argv = [
+            "-I$(BIN_DIR)/test/fixtures/basic",
+            "-explicit-swift-module-map-file",
+        ],
+        mnemonic = "SwiftCompile",
+        target_under_test = "@build_bazel_rules_swift//test/fixtures/basic:second",
+    )
+
+    explicit_swift_module_map_test(
+        name = "{}_explicit_swift_module_map_test".format(name),
+        tags = [name],
+        expected_argv = [
+            "-Xfrontend -explicit-swift-module-map-file -Xfrontend $(BIN_DIR)/test/fixtures/basic/second.swift-explicit-module-map.json",
+        ],
+        not_expected_argv = [
+            "-I$(BIN_DIR)/test/fixtures/basic",
+            "-I/__build_bazel_rules_swift/swiftmodules",
+            "-Xfrontend -vfsoverlay$(BIN_DIR)/test/fixtures/basic/second.vfsoverlay.yaml",
+        ],
+        mnemonic = "SwiftCompile",
+        target_under_test = "@build_bazel_rules_swift//test/fixtures/basic:second",
+    )

test/fixtures/basic/BUILD

@@ -0,0 +1,21 @@
+load("//swift:swift.bzl", "swift_library")
+load("//test/fixtures:common.bzl", "FIXTURE_TAGS")
+
+package(
+    default_visibility = ["//test:__subpackages__"],
+)
+
+licenses(["notice"])
+
+swift_library(
+    name = "first",
+    srcs = ["first.swift"],
+    tags = FIXTURE_TAGS,
+)
+
+swift_library(
+    name = "second",
+    srcs = ["second.swift"],
+    tags = FIXTURE_TAGS,
+    deps = ["first"],
+)

test/fixtures/basic/first.swift

@@ -0,0 +1,3 @@
+public func foo() -> String {
+    return "foo"
+}

test/fixtures/basic/second.swift

@@ -0,0 +1,5 @@
+import first
+
+public func bar() -> String {
+    return foo()
+}

test/rules/action_command_line_test.bzl

@@ -77,7 +77,9 @@ def _action_command_line_test_impl(ctx):
     # end and look for arguments followed by a trailing space so that having
     # `-foo` in the expected list doesn't match `-foobar`, for example.
     concatenated_args = " ".join(action.argv) + " "
+    bin_dir = analysistest.target_bin_dir_path(env)
     for expected in ctx.attr.expected_argv:
+        expected = expected.replace("$(BIN_DIR)", bin_dir)
         if expected + " " not in concatenated_args and expected + "=" not in concatenated_args:
             unittest.fail(
                 env,
@@ -88,6 +90,7 @@ def _action_command_line_test_impl(ctx):
                 ),
             )
     for not_expected in ctx.attr.not_expected_argv:
+        not_expected = not_expected.replace("$(BIN_DIR)", bin_dir)
         if not_expected + " " in concatenated_args or not_expected + "=" in concatenated_args:
             unittest.fail(
                 env,