diff options
| author | Josh Stone <jistone@redhat.com> | 2024-04-23 09:06:52 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2024-04-23 09:06:52 -0700 |
| commit | 899e3ae86b082dd5d314fe90ba26510db64e1d51 (patch) | |
| tree | 21c558ca7d1953d5087f1e99dc253f16aa6cf398 | |
| parent | ad07aa12c99698f810d730d7b5a49704c729651d (diff) | |
bootstrap: keep all cargo test files in dist rustc-src
Cargo tests use some files that we would otherwise exclude, especially the `cargo init` tests that are meant to deal with pre-existing `.git` and `.hg` repos and their ignore files. Keeping these in our dist tarball doesn't take much space, and allows distro builds to run these tests successfully.
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 0eca20901b7..770a5cdb232 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -830,6 +830,12 @@ fn copy_src_dirs( return false; } + // Cargo tests use some files like `.gitignore` that we would otherwise exclude. + const CARGO_TESTS: &[&str] = &["tools/cargo/tests", "tools\\cargo\\tests"]; + if CARGO_TESTS.iter().any(|path| spath.contains(path)) { + return true; + } + let full_path = Path::new(dir).join(path); if exclude_dirs.iter().any(|excl| full_path == Path::new(excl)) { return false; |
