From 71e362fb177031f47673fd37ac35dd758dd5af15 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 3 Apr 2024 11:21:42 -0500 Subject: [PATCH] test(package): Clean up a build.rs test --- tests/testsuite/package.rs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 8f3ab93ad..860d69627 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -3479,24 +3479,25 @@ fn build_script_outside_pkg_root() { ) .file("src/main.rs", "fn main() {}") .build(); - let mut expect_msg = String::from("\ + // custom_build.rs does not exist + p.cargo("package -l") + .with_status(101) + .with_stderr("\ warning: manifest has no documentation, homepage or repository. See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info. error: the source file of build script doesn't appear to exist. This may cause issue during packaging, as modules resolution and resources included via macros are often relative to the path of source files. Please update the `build` setting in the manifest at `[CWD]/Cargo.toml` and point to a path inside the root of the package. -"); - // custom_build.rs does not exist - p.cargo("package -l") - .with_status(101) - .with_stderr(&expect_msg) +") .run(); // custom_build.rs outside the package root let custom_build_root = paths::root().join("t_custom_build"); _ = fs::create_dir(&custom_build_root).unwrap(); _ = fs::write(&custom_build_root.join("custom_build.rs"), "fn main() {}"); - expect_msg = format!( + p.cargo("package -l") + .with_status(101) + .with_stderr(&format!( "\ warning: manifest has no documentation, homepage or repository. See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info. @@ -3504,10 +3505,7 @@ error: the source file of build script doesn't appear to be a path inside of the It is at `{}/t_custom_build/custom_build.rs`, whereas the root the package is `[CWD]`. This may cause issue during packaging, as modules resolution and resources included via macros are often relative to the path of source files. Please update the `build` setting in the manifest at `[CWD]/Cargo.toml` and point to a path inside the root of the package. -", paths::root().display()); - p.cargo("package -l") - .with_status(101) - .with_stderr(&expect_msg) +", paths::root().display())) .run(); }