Fix path resoltion in lit testing

Author: rintaro

build-script.py

@@ -523,22 +523,33 @@ def check_incr_transfer_roundtrip_exec() -> None:
         )
 
 
-def find_lit_test_helper_exec(
-    toolchain: str, build_dir: Optional[str], release: bool
+def find_swiftpm_bin_path(
+    package_dir: str, toolchain: str, build_dir: Optional[str], release: bool
 ) -> str:
     swiftpm_call = get_swiftpm_invocation(
         toolchain=toolchain,
         action="build",
-        package_dir=PACKAGE_DIR,
+        package_dir=package_dir,
         build_dir=build_dir,
         multiroot_data_file=None,
         release=release,
     )
-    swiftpm_call.extend(["--product", "lit-test-helper"])
     swiftpm_call.extend(["--show-bin-path"])
 
     bin_dir = subprocess.check_output(swiftpm_call)
-    return os.path.join(bin_dir.strip().decode('utf-8'), "lit-test-helper")
+    return bin_dir.strip().decode('utf-8')
+
+
+def find_product_bin_path(
+    toolchain: str, build_dir: Optional[str], release: bool
+) -> str:
+    return find_swiftpm_bin_path(PACKAGE_DIR, toolchain, build_dir, release)
+
+
+def find_examples_bin_path(
+    toolchain: str, build_dir: Optional[str], release: bool
+) -> str:
+    return find_swiftpm_bin_path(EXAMPLES_DIR, toolchain, build_dir, release)
 
 
 def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
@@ -548,9 +559,12 @@ def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
     check_lit_exec()
     check_incr_transfer_roundtrip_exec()
 
-    lit_test_helper_exec = find_lit_test_helper_exec(
-        toolchain=toolchain, build_dir=build_dir, release=release
-    )
+    product_bin_path = find_product_bin_path(
+        toolchain=toolchain, build_dir=build_dir, release=release)
+    examples_bin_path = find_examples_bin_path(
+        toolchain=toolchain, build_dir=build_dir, release=release)
+
+    lit_test_helper_exec = os.path.join(product_bin_path, "lit-test-helper")
 
     lit_call = ["python3", LIT_EXEC]
     lit_call.append(os.path.join(PACKAGE_DIR, "lit_tests"))
@@ -562,11 +576,7 @@ def run_lit_tests(toolchain: str, build_dir: Optional[str], release: bool,
     lit_call.extend(
         ["--param", "INCR_TRANSFER_ROUND_TRIP.PY=" + INCR_TRANSFER_ROUNDTRIP_EXEC]
     )
-
-    build_subdir = 'release' if release else 'debug'
-    package_build_dir = build_dir + '/' + build_subdir
-
-    lit_call.extend(["--param", "BUILD_DIR=" + package_build_dir])
+    lit_call.extend(["--param", "EXAMPLES_BIN_PATH=" + examples_bin_path])
     lit_call.extend(["--param", "TOOLCHAIN=" + toolchain])
 
     # Print all failures
@@ -662,7 +672,7 @@ def verify_source_code_command(args: argparse.Namespace) -> None:
 def build_command(args: argparse.Namespace) -> None:
     try:
         builder = Builder(
-            toolchain=args.toolchain,
+            toolchain=realpath(args.toolchain),
             build_dir=realpath(args.build_dir),
             multiroot_data_file=args.multiroot_data_file,
             release=args.release,
@@ -685,7 +695,7 @@ def build_command(args: argparse.Namespace) -> None:
 def test_command(args: argparse.Namespace) -> None:
     try:
         builder = Builder(
-            toolchain=args.toolchain,
+            toolchain=realpath(args.toolchain),
             build_dir=realpath(args.build_dir),
             multiroot_data_file=args.multiroot_data_file,
             release=args.release,
@@ -697,7 +707,7 @@ def test_command(args: argparse.Namespace) -> None:
         builder.buildExample("ExamplePlugin")
 
         run_tests(
-            toolchain=args.toolchain,
+            toolchain=realpath(args.toolchain),
             build_dir=realpath(args.build_dir),
             multiroot_data_file=args.multiroot_data_file,
             release=args.release,

lit_tests/compiler_plugin_basic.swift

@@ -5,7 +5,7 @@
 // RUN: %swift-frontend -typecheck -swift-version 5 \
 // RUN:   -enable-experimental-feature Macros \
 // RUN:   -dump-macro-expansions \
-// RUN:   -load-plugin-executable %build_dir/ExamplePlugin#ExamplePlugin \
+// RUN:   -load-plugin-executable %examples_bin_path/ExamplePlugin#ExamplePlugin \
 // RUN    -module-name MyApp \
 // RUN:   %s > %t/expansions-dump.txt 2>&1
 //

lit_tests/lit.cfg

@@ -59,7 +59,7 @@ config.suffixes = [".swift"]
 config.test_format = lit.formats.ShTest(execute_external=True)
 config.test_exec_root = tempfile.gettempdir()
 
-config.build_dir = lit_config.params.get("BUILD_DIR")
+config.examples_bin_path = lit_config.params.get("EXAMPLES_BIN_PATH")
 config.filecheck = inferSwiftBinary("FileCheck")
 config.incr_transfer_round_trip = inferSwiftBinary("incr_transfer_round_trip.py")
 config.lit_test_helper = inferSwiftBinary("lit-test-helper")
@@ -71,9 +71,9 @@ config.swift_frontend = inferSwiftBinary("swift-frontend")
 #   // REQUIRES: platform=<platform>
 # where <platform> is Linux or Darwin
 # Add a platform feature.
-config.available_features.add("platform="+platform.system())
+config.available_features.add("platform=" + platform.system())
 
-config.substitutions.append(("%build_dir", config.build_dir))
+config.substitutions.append(("%examples_bin_path", config.examples_bin_path))
 config.substitutions.append(
     ("%empty-directory\(([^)]+)\)", 'rm -rf "\\1" && mkdir -p "\\1"')
 )