From 57cdb59fc6315c26205335c1f49037384eb60d3c Mon Sep 17 00:00:00 2001 From: Boris Buegling Date: Mon, 14 Mar 2022 18:39:22 -0700 Subject: [PATCH] Pass `SWIFT_EXEC` to swift-test via bootstrap It looks like so far we have only been passing `SWIFT_EXEC` to `swift-build` but not `swift-test`. --- Utilities/bootstrap | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 1c9b926a138..b17b6829ab3 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -363,7 +363,11 @@ def test(args): note("Testing") parse_test_args(args) - cmd = [os.path.join(args.bin_dir, "swift-test")] + cmd = [ + "SWIFT_EXEC=" + args.swiftc_path, + "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path, + os.path.join(args.bin_dir, "swift-test") + ] if args.parallel: cmd.append("--parallel") for arg in args.filter: