Skip to content

Commit 34afc4f

Browse files
epageepage
committed
test(msrv): Prep for config to be added
1 parent 226b53e commit 34afc4f

File tree

9 files changed

+88
-0
lines changed

9 files changed

+88
-0
lines changed

‎tests/testsuite/cargo_add/rust_version_ignore/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ fn case() {
2525
.arg("--ignore-rust-version")
2626
.arg_line("rust-version-user")
2727
.current_dir(cwd)
28+
.env(
29+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
30+
"something-like-rust-version",
31+
)
2832
.masquerade_as_nightly_cargo(&["msrv-policy"])
2933
.assert()
3034
.code(0)

‎tests/testsuite/cargo_add/rust_version_incompatible/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ fn case() {
2727
.arg("add")
2828
.arg_line("rust-version-user")
2929
.current_dir(cwd)
30+
.env(
31+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
32+
"something-like-rust-version",
33+
)
3034
.masquerade_as_nightly_cargo(&["msrv-policy"])
3135
.assert()
3236
.failure()

‎tests/testsuite/cargo_add/rust_version_latest/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ fn case() {
2424
.arg("add")
2525
.arg_line("rust-version-user")
2626
.current_dir(cwd)
27+
.env(
28+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
29+
"something-like-rust-version",
30+
)
2731
.masquerade_as_nightly_cargo(&["msrv-policy"])
2832
.assert()
2933
.success()

‎tests/testsuite/cargo_add/rust_version_older/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ fn case() {
2424
.arg("add")
2525
.arg_line("rust-version-user")
2626
.current_dir(cwd)
27+
.env(
28+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
29+
"something-like-rust-version",
30+
)
2731
.masquerade_as_nightly_cargo(&["msrv-policy"])
2832
.assert()
2933
.success()

‎tests/testsuite/cargo_add/rustc_ignore/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ fn case() {
2828
.arg("--ignore-rust-version")
2929
.arg_line("rust-version-user")
3030
.current_dir(cwd)
31+
.env(
32+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
33+
"something-like-rust-version",
34+
)
3135
.masquerade_as_nightly_cargo(&["msrv-policy"])
3236
.assert()
3337
.code(0)

‎tests/testsuite/cargo_add/rustc_incompatible/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ fn case() {
2121
.arg("add")
2222
.arg_line("rust-version-user")
2323
.current_dir(cwd)
24+
.env(
25+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
26+
"something-like-rust-version",
27+
)
2428
.masquerade_as_nightly_cargo(&["msrv-policy"])
2529
.assert()
2630
.failure()

‎tests/testsuite/cargo_add/rustc_latest/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ fn case() {
2727
.arg("add")
2828
.arg_line("rust-version-user")
2929
.current_dir(cwd)
30+
.env(
31+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
32+
"something-like-rust-version",
33+
)
3034
.masquerade_as_nightly_cargo(&["msrv-policy"])
3135
.assert()
3236
.success()

‎tests/testsuite/cargo_add/rustc_older/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ fn case() {
2727
.arg("add")
2828
.arg_line("rust-version-user")
2929
.current_dir(cwd)
30+
.env(
31+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
32+
"something-like-rust-version",
33+
)
3034
.masquerade_as_nightly_cargo(&["msrv-policy"])
3135
.assert()
3236
.success()

‎tests/testsuite/rust_version.rs

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ fn resolve_with_rust_version() {
213213
.build();
214214

215215
p.cargo("generate-lockfile --ignore-rust-version")
216+
.env(
217+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
218+
"something-like-rust-version",
219+
)
216220
.arg("-Zmsrv-policy")
217221
.masquerade_as_nightly_cargo(&["msrv-policy"])
218222
.with_stderr(
@@ -233,6 +237,10 @@ foo v0.0.1 ([CWD])
233237
.run();
234238

235239
p.cargo("generate-lockfile")
240+
.env(
241+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
242+
"something-like-rust-version",
243+
)
236244
.arg("-Zmsrv-policy")
237245
.masquerade_as_nightly_cargo(&["msrv-policy"])
238246
.with_stderr(
@@ -289,6 +297,10 @@ fn resolve_with_rustc() {
289297
.build();
290298

291299
p.cargo("generate-lockfile --ignore-rust-version")
300+
.env(
301+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
302+
"something-like-rust-version",
303+
)
292304
.arg("-Zmsrv-policy")
293305
.masquerade_as_nightly_cargo(&["msrv-policy"])
294306
.with_stderr(
@@ -309,6 +321,10 @@ foo v0.0.1 ([CWD])
309321
.run();
310322

311323
p.cargo("generate-lockfile")
324+
.env(
325+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
326+
"something-like-rust-version",
327+
)
312328
.arg("-Zmsrv-policy")
313329
.masquerade_as_nightly_cargo(&["msrv-policy"])
314330
.with_stderr(
@@ -363,6 +379,10 @@ fn resolve_with_backtracking() {
363379
.build();
364380

365381
p.cargo("generate-lockfile --ignore-rust-version")
382+
.env(
383+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
384+
"something-like-rust-version",
385+
)
366386
.arg("-Zmsrv-policy")
367387
.masquerade_as_nightly_cargo(&["msrv-policy"])
368388
.with_stderr(
@@ -384,6 +404,10 @@ foo v0.0.1 ([CWD])
384404

385405
// Ideally we'd pick `has-rust-version` 1.6.0 which requires backtracking
386406
p.cargo("generate-lockfile")
407+
.env(
408+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
409+
"something-like-rust-version",
410+
)
387411
.arg("-Zmsrv-policy")
388412
.masquerade_as_nightly_cargo(&["msrv-policy"])
389413
.with_stderr(
@@ -462,6 +486,10 @@ fn resolve_with_multiple_rust_versions() {
462486
.build();
463487

464488
p.cargo("generate-lockfile --ignore-rust-version")
489+
.env(
490+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
491+
"something-like-rust-version",
492+
)
465493
.arg("-Zmsrv-policy")
466494
.masquerade_as_nightly_cargo(&["msrv-policy"])
467495
.with_stderr(
@@ -482,6 +510,10 @@ higher v0.0.1 ([CWD])
482510
.run();
483511

484512
p.cargo("generate-lockfile")
513+
.env(
514+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
515+
"something-like-rust-version",
516+
)
485517
.arg("-Zmsrv-policy")
486518
.masquerade_as_nightly_cargo(&["msrv-policy"])
487519
.with_stderr(
@@ -572,6 +604,10 @@ fn update_msrv_resolve() {
572604
.build();
573605

574606
p.cargo("update")
607+
.env(
608+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
609+
"something-like-rust-version",
610+
)
575611
.arg("-Zmsrv-policy")
576612
.masquerade_as_nightly_cargo(&["msrv-policy"])
577613
.with_stderr(
@@ -593,6 +629,10 @@ See https://github.com/rust-lang/cargo/issues/9930 for more information about th
593629
)
594630
.run();
595631
p.cargo("update --ignore-rust-version")
632+
.env(
633+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
634+
"something-like-rust-version",
635+
)
596636
.arg("-Zmsrv-policy")
597637
.masquerade_as_nightly_cargo(&["msrv-policy"])
598638
.with_stderr(
@@ -634,6 +674,10 @@ fn update_precise_overrides_msrv_resolver() {
634674
.build();
635675

636676
p.cargo("update")
677+
.env(
678+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
679+
"something-like-rust-version",
680+
)
637681
.arg("-Zmsrv-policy")
638682
.masquerade_as_nightly_cargo(&["msrv-policy"])
639683
.with_stderr(
@@ -645,6 +689,10 @@ fn update_precise_overrides_msrv_resolver() {
645689
)
646690
.run();
647691
p.cargo("update --precise 1.6.0 bar")
692+
.env(
693+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
694+
"something-like-rust-version",
695+
)
648696
.arg("-Zmsrv-policy")
649697
.masquerade_as_nightly_cargo(&["msrv-policy"])
650698
.with_stderr(
@@ -691,6 +739,10 @@ fn check_msrv_resolve() {
691739
.build();
692740

693741
p.cargo("check --ignore-rust-version")
742+
.env(
743+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
744+
"something-like-rust-version",
745+
)
694746
.arg("-Zmsrv-policy")
695747
.masquerade_as_nightly_cargo(&["msrv-policy"])
696748
.with_stderr(
@@ -719,6 +771,10 @@ foo v0.0.1 ([CWD])
719771

720772
std::fs::remove_file(p.root().join("Cargo.lock")).unwrap();
721773
p.cargo("check")
774+
.env(
775+
"CARGO_RESOLVER_SOMETHING_LIKE_PRECEDENCE",
776+
"something-like-rust-version",
777+
)
722778
.arg("-Zmsrv-policy")
723779
.masquerade_as_nightly_cargo(&["msrv-policy"])
724780
.with_stderr(

0 commit comments

Comments
 (0)