itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 1.51.0 in old cargos test

Browse Source 
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
This commit is contained in:
hi-rustin 2021-12-05 11:36:56 +08:00
parent c9a8199e92
commit 047edec357
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/testsuite/old_cargos.rs
View File

@ -7,7 +7,7 @@
//! tested 1.0 to 1.51. Run this with: //! tested 1.0 to 1.51. Run this with:
//! //!
//! ```console //! ```console
//! cargo test --test testsuite -- old_cargos --nocapture --ignored //! cargo test --test testsuite -- old_cargos --nocapture
//! ``` //! ```
use cargo::CargoResult; use cargo::CargoResult;
@ -102,7 +102,6 @@ fn collect_all_toolchains() -> Vec<(Version, String)> {
// The optional dependency `new-baz-dep` should not be activated. // The optional dependency `new-baz-dep` should not be activated.
// * `bar` 1.0.2 has a dependency on `baz` that *requires* the new feature // * `bar` 1.0.2 has a dependency on `baz` that *requires* the new feature
// syntax. // syntax.
#[ignore]
#[cargo_test] #[cargo_test]
fn new_features() { fn new_features() {
if std::process::Command::new("rustup").output().is_err() { if std::process::Command::new("rustup").output().is_err() {
@ -411,8 +410,7 @@ fn new_features() {
p.build_dir().rm_rf(); p.build_dir().rm_rf();
match run_cargo() { match run_cargo() {
Ok(behavior) => { Ok(behavior) => {
// TODO: Switch to 51 after backport. if version < &Version::new(1, 51, 0) && toolchain != "this" {
if version < &Version::new(1, 52, 0) && toolchain != "this" {
check_lock!(tc_result, "bar", which, behavior.bar, "1.0.2"); check_lock!(tc_result, "bar", which, behavior.bar, "1.0.2");
check_lock!(tc_result, "baz", which, behavior.baz, "1.0.1"); check_lock!(tc_result, "baz", which, behavior.baz, "1.0.1");
check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None); check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None);
@ -449,12 +447,13 @@ fn new_features() {
check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None); check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None);
} }
Err(e) => { Err(e) => {
if toolchain == "this" { if version >= &Version::new(1, 51, 0) || toolchain == "this" {
// 1.0.1 can't be used without -Znamespaced-features // 1.0.1 can't be used without -Znamespaced-features
// It gets filtered out of the index. // It gets filtered out of the index.
check_err_contains(&mut tc_result, e, check_err_contains(
"error: failed to select a version for the requirement `bar = \"=1.0.1\"`\n\ &mut tc_result,
candidate versions found which didn't match: 1.0.2, 1.0.0" e,
"candidate versions found which didn't match: 1.0.2, 1.0.0",
); );
} else { } else {
tc_result.push(format!("bar 1.0.1 locked build failed: {}", e)); tc_result.push(format!("bar 1.0.1 locked build failed: {}", e));
@ -471,11 +470,12 @@ fn new_features() {
check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None); check_lock!(tc_result, "new-baz-dep", which, behavior.new_baz_dep, None);
} }
Err(e) => { Err(e) => {
if toolchain == "this" { if version >= &Version::new(1, 51, 0) || toolchain == "this" {
// baz can't lock to 1.0.1, it requires -Znamespaced-features // baz can't lock to 1.0.1, it requires -Znamespaced-features
check_err_contains(&mut tc_result, e, check_err_contains(
"error: failed to select a version for the requirement `baz = \"=1.0.1\"`\n\ &mut tc_result,
candidate versions found which didn't match: 1.0.0" e,
"candidate versions found which didn't match: 1.0.0",
); );
} else { } else {
tc_result.push(format!("bar 1.0.2 locked build failed: {}", e)); tc_result.push(format!("bar 1.0.2 locked build failed: {}", e));
@ -504,7 +504,6 @@ fn new_features() {
} }
#[cargo_test] #[cargo_test]
#[ignore]
fn index_cache_rebuild() { fn index_cache_rebuild() {
// Checks that the index cache gets rebuilt. // Checks that the index cache gets rebuilt.
// //
@ -588,7 +587,6 @@ foo v0.1.0 [..]
} }
#[cargo_test] #[cargo_test]
#[ignore]
fn avoids_split_debuginfo_collision() { fn avoids_split_debuginfo_collision() {
// Checks for a bug where .o files were being incorrectly shared between // Checks for a bug where .o files were being incorrectly shared between
// different toolchains using incremental and split-debuginfo on macOS. // different toolchains using incremental and split-debuginfo on macOS.
@ -637,7 +635,6 @@ fn avoids_split_debuginfo_collision() {
.cwd(p.root()) .cwd(p.root())
.with_stderr( .with_stderr(
"\ "\
[COMPILING] foo v0.1.0 [..]
[FINISHED] [..] [FINISHED] [..]
", ",
) )