Skip to content

Commit 3e3460d

Browse files
committed
Install release products when called /w --release
1 parent 1c3db5e commit 3e3460d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Utilities/bootstrap

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,15 +651,20 @@ def main():
651651
if result != 0:
652652
error("build failed with exit status %d" % (result,))
653653

654-
swift_build_path = os.path.join(build_path, "debug", "swift-build")
655-
swift_test_path = os.path.join(build_path, "debug", "swift-test")
654+
if args.release:
655+
conf = "release"
656+
else:
657+
conf = "debug"
658+
659+
swift_build_path = os.path.join(build_path, conf, "swift-build")
660+
swift_test_path = os.path.join(build_path, conf, "swift-test")
656661

657662
# If testing, run each of the test bundles.
658663
if "test" in build_actions:
659664
# Construct the test environment.
660665
env_cmd = ["env", "SWIFT_EXEC=" + os.path.join(bindir, "swiftc"),
661666
"SWIFT_BUILD_PATH=" + build_path]
662-
cmd = env_cmd + [os.path.join(build_path, "debug", "swift-test")]
667+
cmd = env_cmd + [swift_test_path]
663668
result = subprocess.call(cmd, cwd=g_project_root)
664669
if result != 0:
665670
error("tests failed with exit status %d" % (result,))

0 commit comments

Comments
 (0)