Commit Graph

6283 Commits

Author SHA1 Message Date
d1t2
1794ce42f4
test: Revert clean_dry_run for expected path not normalized 2024-06-26 17:40:58 +08:00
d1t2
b3a9decdac
test: migrate clean to snapbox 2024-06-26 17:28:23 +08:00
bors
ec77aa9656 Auto merge of #14143 - heisen-li:dep_dia_dir, r=weihanglo
test: migrate `dep_info/diagnostics/direct_minimal_versions` to snapbox

### What does this PR try to resolve?

Complete the migration of the following files:

```
 tests/testsuite/dep_info.rs
 tests/testsuite/diagnostics.rs
 tests/testsuite/direct_minimal_versions.rs
```
part of #14039
2024-06-25 23:00:06 +00:00
bors
4ed7bee47f Auto merge of #14142 - weihanglo:fix-test, r=epage
test: omit target-dir name

This was found during submodule update in rust-lang/rust repo.

```
---- publish_lockfile::note_resolve_changes stdout ----
thread 'publish_lockfile::note_resolve_changes' panicked at tests/testsuite/publish_lockfile.rs:255:10:

error: Expected lines did not match (ignoring order):
0   6        Packaging foo v0.0.1 ([..])
1   0        Archiving Cargo.lock
2   0        Archiving Cargo.toml
3   1        Archiving Cargo.toml.orig
4   0        Archiving src/main.rs
5   0         Updating `dummy-registry` index
6   2     note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
7   2     note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
8   0         Packaged 4 files, 2.1KiB (1.1KiB compressed)
9        -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`
    9    +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]`
```
2024-06-25 16:28:22 +00:00
l00556901
113dcf6208 test: migrate direct_minimal_versions to snapbox 2024-06-26 00:22:01 +08:00
l00556901
11506bbd9a test: migrate diagnostics to snapbox 2024-06-26 00:21:20 +08:00
l00556901
f05a896ac3 test: migrate dep_info to snapbox 2024-06-26 00:20:31 +08:00
Weihang Lo
47ddb3a57d
test: omit target-dir name
This was found during submodule update in rust-lang/rust repo.

```
error: Expected lines did not match (ignoring order):
0   6        Packaging foo v0.0.1 ([..])
1   0        Archiving Cargo.lock
2   0        Archiving Cargo.toml
3   1        Archiving Cargo.toml.orig
4   0        Archiving src/main.rs
5   0         Updating `dummy-registry` index
6   2     note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
7   2     note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
8   0         Packaged 4 files, 2.1KiB (1.1KiB compressed)
9        -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`
    9    +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]`
```
2024-06-25 12:20:12 -04:00
eth3lbert
0290ea0996
test: migrate owner to snapbox 2024-06-25 18:46:54 +08:00
eth3lbert
145145a83f
test: migrate open_namespaces to snapbox 2024-06-25 18:46:52 +08:00
eth3lbert
a9fec1b37b
test: migrate offline to snapbox 2024-06-25 15:21:24 +08:00
Esteban Küber
af3f95d3a3 Change tests to support rustc wording changes
Between https://github.com/rust-lang/rust/pull/126810 and https://github.com/rust-lang/rust/pull/126810
the output of `rustc` for resolution errors is going to change in such a
way that some existing cargo tests will fail. Change them to support
both the current and future output, so that those PRs can land in
`rustc`.
2024-06-25 01:16:48 +00:00
Tor Hovland
e7bfed103c Skip serializing the dirty flag if false. 2024-06-24 13:02:25 +02:00
Tor Hovland
1b636855a9 Add a dirty flag to the vcs_info file. 2024-06-24 13:02:25 +02:00
Tor Hovland
2a1299a878 fix: Include vcs_info even if workspace is dirty. 2024-06-24 13:02:25 +02:00
Tor Hovland
a6ad3a3ed5 test: Verify that the vcs_info file is not included in package when allowing dirty. 2024-06-24 13:02:25 +02:00
bors
e18afe264e Auto merge of #14128 - eth3lbert:snapbox-profile, r=weihanglo
test: migrate profile* to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/profile_config.rs`
- `tests/testsuite/profile_custom.rs`
- `tests/testsuite/profile_overrides.rs`
- `tests/testsuite/profile_targets.rs`
- `tests/testsuite/profile_trim_paths.rs`
- `tests/testsuite/profiles.rs`
2024-06-23 20:53:07 +00:00
bors
9a7a603e5b Auto merge of #14109 - eth3lbert:snapbox-path, r=weihanglo
test: migrate path and paths to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/path.rs`
- `tests/testsuite/paths.rs`
2024-06-23 20:23:25 +00:00
eth3lbert
c7926a1289
test: migrate paths to snapbox 2024-06-24 04:16:06 +08:00
eth3lbert
ae95c35264
test: migrate path to snapbox 2024-06-24 04:16:06 +08:00
eth3lbert
155984002f
test: migrate profiles to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
1ba4291021
test: migrate profile_trim_paths to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
02542ef88b
test: migrate profile_targets to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
41930ab613
test: migrate profile_overrides to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
dbb67df283
test: migrate profile_custom to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
f58bb77033
test: migrate profile_config to snapbox 2024-06-23 12:58:36 +08:00
bors
fcd3c079b9 Auto merge of #14126 - eth3lbert:snapbox-rrs, r=epage
test: migrate rustflags, rustup and script to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/rustflags.rs`
- `tests/testsuite/rustup.rs`
- `tests/testsuite/script.rs`
2024-06-23 03:20:19 +00:00
eth3lbert
297b24a8eb
test: migrate script to snapbox 2024-06-23 11:10:16 +08:00
eth3lbert
913b12b8d4
test: migrate run to snapbox 2024-06-22 21:31:02 +08:00
eth3lbert
2a6869bbc1
test: migrate required_features to snapbox 2024-06-22 21:11:01 +08:00
eth3lbert
2f37268dcd
test: migrate replace to snapbox 2024-06-22 18:59:37 +08:00
eth3lbert
2d23d031e3
test: migrate rename_deps to snapbox 2024-06-22 13:15:42 +08:00
eth3lbert
67aad4f242
test: migrate rustup to snapbox 2024-06-22 12:25:18 +08:00
eth3lbert
808b777d45
test: migrate rustflags to snapbox 2024-06-22 12:25:18 +08:00
bors
bc89bffa59 Auto merge of #14111 - eth3lbert:snapbox-wwy, r=epage
test: migrate weak_dep_features, workspaces and yank to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/weak_dep_features.rs`
- `tests/testsuite/workspaces.rs`
- `tests/testsuite/yank.rs`
2024-06-22 00:36:36 +00:00
bors
3697a02a18 Auto merge of #14100 - eth3lbert:snapbox-features, r=weihanglo
test: migrate features and features(2|_namespaced) to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:
- tests/testsuite/features.rs
- tests/testsuite/features2.rs
- tests/testsuite/features_namespaced.rs
2024-06-21 23:52:26 +00:00
eth3lbert
e3ea0aad30
test: migrate yank to snapbox 2024-06-22 06:26:56 +08:00
eth3lbert
7aeed67bfb
test: migrate workspaces to snapbox 2024-06-22 06:26:56 +08:00
eth3lbert
51b794636d
test: migrate weak_dep_features to snapbox 2024-06-22 06:26:56 +08:00
eth3lbert
91569f84b0
test: Add auto-redaction for not found error 2024-06-22 05:13:58 +08:00
bors
e35cd55b1a Auto merge of #14068 - weihanglo:snapbox-build, r=epage
test: migrate build to snapbox
2024-06-21 17:29:05 +00:00
bors
ce90393a11 Auto merge of #14119 - eth3lbert:snapbox-uuv, r=epage
test: migrate unit_graph, update and vendor to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/unit_graph.rs`
- `tests/testsuite/update.rs`
- `tests/testsuite/vendor.rs`
2024-06-21 15:45:27 +00:00
Ed Page
fd8a91d185 fix(test): Un-redact Packaged files
This is a partial revert of ##14121
(e11d1722bb)

Our focus for redacting (auto or with globs) includes
- run-specific information (timing, hashes, platform-specific wording)
- rustc-specific information

(We tend to use globs for rustc-specific information because there might
be some very specific times we need to care about some of the details)

However, "Packaged files" does not fit into any of that and, for now, we
are erring on the side of redacting less, rather than more, with the
move to snapbox.
As we see how it works out and what the underlying requirements are, we
can revisit this.
2024-06-21 11:05:41 -04:00
bors
922960916d Auto merge of #14121 - dieterplex:redact-file-num, r=weihanglo
test: Auto-redact file number

This is from <https://github.com/rust-lang/cargo/pull/14096#discussion_r1648889843>.

Although the number of files in `cargo package` is important,
we have `validate_crate_contents` and `validate_upload_with_contents`
that verify the exact contents.
Redacting `Packaged` status should be fine.
2024-06-21 13:14:27 +00:00
eth3lbert
f978616862
test: migrate vendor to snapbox 2024-06-21 15:19:23 +08:00
eth3lbert
c7c1462b28
test: migrate update to snapbox 2024-06-21 15:19:23 +08:00
eth3lbert
b424c57e86
test: migrate unit_graph to snapbox 2024-06-21 14:19:21 +08:00
eth3lbert
a50e0a121c
fixup! test: migrate features2 to snapbox 2024-06-21 13:57:16 +08:00
eth3lbert
c2301fa75d
fixup! test: migrate features_namespaced to snapbox 2024-06-21 13:52:01 +08:00
bors
cabd5eb276 Auto merge of #14104 - eth3lbert:snapbox-lints, r=weihanglo
test: migrate lints_table and lints/(mod|unknown_lints) to snapbox

### What does this PR try to resolve?

Part of #14039.

Migrate followings to snapbox:
- `tests/testsuite/lints/mod.rs`
- `tests/testsuite/lints/unknown_lints.rs`
- `tests/testsuite/lints_table.rs`
2024-06-21 00:41:07 +00:00