From 950b4839a80081e7f4289954d3b4030dc313bf2c Mon Sep 17 00:00:00 2001 From: Keiichi Watanabe Date: Mon, 1 Aug 2022 22:17:14 +0900 Subject: [PATCH] tools: Use `--no-default-features` in crosvm-direct builder Since ChromeOS's crosvm ebuild uses `--no-default-features` for crosvm-direct, our LUCI builder should do so, too. BUG=b:220292205 TEST=./tools/run_tests --target=host --crosvm-direct Change-Id: I2550bf5931e90ebf434fda0990ac5d707ba5ac12 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3802108 Auto-Submit: Keiichi Watanabe Tested-by: Keiichi Watanabe Reviewed-by: Dennis Kempin Commit-Queue: Dennis Kempin --- tools/impl/test_runner.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/impl/test_runner.py b/tools/impl/test_runner.py index 501c5f12a9..5f03bce5be 100644 --- a/tools/impl/test_runner.py +++ b/tools/impl/test_runner.py @@ -239,16 +239,22 @@ def build_all_binaries(target: TestTarget, crosvm_direct: bool): print("Building crosvm workspace") features = BUILD_FEATURES[str(target.build_triple)] + extra_args = [] if crosvm_direct: features += ",direct" + extra_args.append("--no-default-features") + + cargo_args = [ + "--features=" + features, + f"--target={target.build_triple}", + "--verbose", + "--workspace", + *[f"--exclude={crate}" for crate in get_workspace_excludes(target.build_triple)], + ] + cargo_args.extend(extra_args) + yield from cargo_build_executables( - [ - "--features=" + features, - f"--target={target.build_triple}", - "--verbose", - "--workspace", - *[f"--exclude={crate}" for crate in get_workspace_excludes(target.build_triple)], - ], + cargo_args, cwd=CROSVM_ROOT, env=build_env, )