diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-02 10:27:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-02 10:27:22 +0200 |
| commit | a353cb0cd8fb1d03a117eccd2987ebf0d3e04ee2 (patch) | |
| tree | 2533fdc96a8ee09ba928519f04b5be0acf97c65a /src/bootstrap/test.rs | |
| parent | fda22efbf0e0dac5b35a4b2a5ca1ab85e155a8e5 (diff) | |
| parent | 85372005e71210033cc2adc9e124730e3cfad2ff (diff) | |
| download | rust-a353cb0cd8fb1d03a117eccd2987ebf0d3e04ee2.tar.gz rust-a353cb0cd8fb1d03a117eccd2987ebf0d3e04ee2.zip | |
Rollup merge of #113234 - jyn514:revert-python-test-args, r=clubby789
Don't pass --test-args to `python -m unitest` The args for unittest and cargo test are mutually incompatible. Suggest that people use `python -m unittest ...` manually instead. This also changes `bootstrap_test.py` to be easier to run standalone; see the commit for details. r? `@clubby789` cc https://github.com/rust-lang/rust/pull/112281#discussion_r1248849172
Diffstat (limited to 'src/bootstrap/test.rs')
| -rw-r--r-- | src/bootstrap/test.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index a2938ab4caf..1f514898a89 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -2682,8 +2682,9 @@ impl Step for Bootstrap { .args(["-m", "unittest", "bootstrap_test.py"]) .env("BUILD_DIR", &builder.out) .env("BUILD_PLATFORM", &builder.build.build.triple) - .current_dir(builder.src.join("src/bootstrap/")) - .args(builder.config.test_args()); + .current_dir(builder.src.join("src/bootstrap/")); + // NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible. + // Use `python -m unittest` manually if you want to pass arguments. try_run(builder, &mut check_bootstrap).unwrap(); let host = builder.config.build; |