Fix cargo ui tests when running inside rust repo
This commit is contained in:
parent
413713c884
commit
c325c120c2
9 changed files with 16 additions and 4 deletions
|
@ -147,6 +147,8 @@ fn get_manifest_contents(lint_name: &str, hint: &str) -> String {
|
||||||
name = "{}"
|
name = "{}"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
"#,
|
"#,
|
||||||
hint, lint_name
|
hint, lint_name
|
||||||
)
|
)
|
||||||
|
|
|
@ -220,10 +220,6 @@ fn run_ui_cargo(config: &mut compiletest::Config) {
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cargo::is_rustc_test_suite() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
config.mode = TestMode::Ui;
|
config.mode = TestMode::Ui;
|
||||||
config.src_base = Path::new("tests").join("ui-cargo").canonicalize().unwrap();
|
config.src_base = Path::new("tests").join("ui-cargo").canonicalize().unwrap();
|
||||||
|
|
||||||
|
|
|
@ -2,3 +2,5 @@
|
||||||
name = "cargo_common_metadata"
|
name = "cargo_common_metadata"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
|
@ -9,3 +9,5 @@ readme = "README.md"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
keywords = ["metadata", "lint", "clippy"]
|
keywords = ["metadata", "lint", "clippy"]
|
||||||
categories = ["development-tools::testing"]
|
categories = ["development-tools::testing"]
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
|
@ -5,6 +5,8 @@ name = "multiple_crate_versions"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
||||||
# One of the versions of winapi is only a dev dependency: allowed
|
# One of the versions of winapi is only a dev dependency: allowed
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ctrlc = "=3.1.0"
|
ctrlc = "=3.1.0"
|
||||||
|
|
|
@ -3,6 +3,8 @@ name = "multiple_crate_versions"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ctrlc = "=3.1.0"
|
ctrlc = "=3.1.0"
|
||||||
ansi_term = "=0.11.0"
|
ansi_term = "=0.11.0"
|
||||||
|
|
|
@ -3,6 +3,8 @@ name = "cargo_common_metadata"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
regex = "1.3.7"
|
regex = "1.3.7"
|
||||||
serde = "1.0.110"
|
serde = "1.0.110"
|
||||||
|
|
|
@ -3,5 +3,7 @@ name = "wildcard_dependencies"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
regex = "*"
|
regex = "*"
|
||||||
|
|
|
@ -3,5 +3,7 @@ name = "wildcard_dependencies"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
regex = "1"
|
regex = "1"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue