Skip to content

build-using-self: Add ability to pass extra build/run/test arguments #8723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2025
Merged

build-using-self: Add ability to pass extra build/run/test arguments #8723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 48 additions & 18 deletions Utilities/build-using-self
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_arguments() -> argparse.Namespace:
dest="config",
default=Configuration.DEBUG,
choices=[e for e in Configuration],
help="The configuraiton to use.",
help="The configuration to use.",
)
parser.add_argument(
"-t",
Expand All @@ -90,6 +90,36 @@ def get_arguments() -> argparse.Namespace:
"--enable-xctest",
action="store_true",
)
parser.add_argument(
"--additional-build-args",
type=str,
dest="additional_build_args",
default=""
)
parser.add_argument(
"--additional-run-args",
type=str,
dest="additional_run_args",
default=""
)
parser.add_argument(
"--additional-test-args",
type=str,
dest="additional_test_args",
default=""
)
parser.add_argument(
"--additional-integration-test-args",
type=str,
dest="additional_integration_test_args",
default=""
)
parser.add_argument(
"--skip-bootstrap",
dest="skip_bootstrap",
action="store_true"
)
parser.set_defaults(skip_bootstrap=False)
args = parser.parse_args()
return args

Expand Down Expand Up @@ -157,8 +187,8 @@ class GlobalArgs:
value: t.Optional[GlobalArgsValueType]


def filterNone(items: t.Iterable) -> t.Iterable:
return list(filter(lambda x: x is not None, items))
def filterNoneAndEmpty(items: t.Iterable) -> t.Iterable:
return list(filter(lambda x: x is not None and x != '', items))


def main() -> None:
Expand All @@ -181,7 +211,7 @@ def main() -> None:
set_environment(swiftpm_bin_dir=swiftpm_bin_dir)

call(
filterNone(
filterNoneAndEmpty(
[
"swift",
"--version",
Expand All @@ -190,7 +220,7 @@ def main() -> None:
)

call(
filterNone(
filterNoneAndEmpty(
[
"swift",
"package",
Expand All @@ -199,44 +229,42 @@ def main() -> None:
)
)
call(
filterNone(
filterNoneAndEmpty(
[
"swift",
"build",
*global_args,
"--configuration",
args.config,
*ignore_args,
*args.additional_build_args.split(" ")
]
)
)

swift_testing_arg = (
"--enable-swift-testing" if args.enable_swift_testing else None
)
xctest_arg = "--enable-xctest" if args.enable_swift_testing else None
call(
filterNone(
filterNoneAndEmpty(
[
"swift",
"run",
*args.additional_run_args.split(" "),
"swift-test",
*global_args,
"--configuration",
args.config,
"--parallel",
swift_testing_arg,
xctest_arg,
"--enable-swift-testing" if args.enable_swift_testing else None,
"--enable-xctest" if args.enable_swift_testing else None,
"--scratch-path",
".test",
*ignore_args,
*args.additional_test_args.split(" ")
]
)
)

integration_test_dir = (REPO_ROOT_PATH / "IntegrationTests").as_posix()
call(
filterNone(
filterNoneAndEmpty(
[
"swift",
"package",
Expand All @@ -247,21 +275,23 @@ def main() -> None:
)
)
call(
filterNone(
[
filterNoneAndEmpty(
[
"swift",
"run",
*args.additional_run_args.split(" "),
"swift-test",
*global_args,
"--package-path",
integration_test_dir,
"--parallel",
*ignore_args,
*args.additional_integration_test_args.split(" ")
]
)
)

if is_on_darwin():
if is_on_darwin() and not args.skip_bootstrap:
run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
logging.info("Done")

Expand Down