mirror of
https://github.com/rust-lang/cargo
synced 2024-10-13 03:02:45 +00:00
Update build script tests to use cargo::
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
This commit is contained in:
hi-rustin
parent
25365d904c
commit
dfb2795ffe
|
|
@ -824,7 +824,7 @@ fn custom_build_script_wrong_rustc_flags() {
|
|||
.file("src/main.rs", "fn main() {}")
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-flags=-aaa -bbb"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-flags=-aaa -bbb"); }"#,
|
||||
)
|
||||
.build();
|
||||
|
||||
|
|
@ -870,7 +870,7 @@ fn custom_build_script_rustc_flags() {
|
|||
"foo/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-l nonexistinglib -L /dummy/path1 -L /dummy/path2");
|
||||
println!("cargo::rustc-flags=-l nonexistinglib -L /dummy/path1 -L /dummy/path2");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -929,7 +929,7 @@ fn custom_build_script_rustc_flags_no_space() {
|
|||
"foo/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-lnonexistinglib -L/dummy/path1 -L/dummy/path2");
|
||||
println!("cargo::rustc-flags=-lnonexistinglib -L/dummy/path1 -L/dummy/path2");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -1308,8 +1308,8 @@ fn links_passes_env_vars() {
|
|||
let lib = env::var("CARGO_MANIFEST_LINKS").unwrap();
|
||||
assert_eq!(lib, "foo");
|
||||
|
||||
println!("cargo:foo=bar");
|
||||
println!("cargo:bar=baz");
|
||||
println!("cargo::metadata=foo=bar");
|
||||
println!("cargo::metadata=bar=baz");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -1375,8 +1375,8 @@ fn rebuild_continues_to_pass_env_vars() {
|
|||
r#"
|
||||
use std::time::Duration;
|
||||
fn main() {
|
||||
println!("cargo:foo=bar");
|
||||
println!("cargo:bar=baz");
|
||||
println!("cargo::metadata=foo=bar");
|
||||
println!("cargo::metadata=bar=baz");
|
||||
std::thread::sleep(Duration::from_millis(500));
|
||||
}
|
||||
"#,
|
||||
|
|
@ -1522,7 +1522,7 @@ fn propagation_of_l_flags() {
|
|||
.file("a/src/lib.rs", "")
|
||||
.file(
|
||||
"a/build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-flags=-L bar"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-flags=-L bar"); }"#,
|
||||
)
|
||||
.file(
|
||||
"b/Cargo.toml",
|
||||
|
|
@ -1595,7 +1595,7 @@ fn propagation_of_l_flags_new() {
|
|||
"a/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=bar");
|
||||
println!("cargo::rustc-link-search=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -1903,8 +1903,8 @@ fn output_separate_lines() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-L foo");
|
||||
println!("cargo:rustc-flags=-l static=foo");
|
||||
println!("cargo::rustc-flags=-L foo");
|
||||
println!("cargo::rustc-flags=-l static=foo");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -1941,10 +1941,10 @@ fn output_separate_lines_new() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=foo");
|
||||
println!("cargo:rustc-link-lib=static=foo");
|
||||
println!("cargo:rustc-link-lib=bar");
|
||||
println!("cargo:rustc-link-search=bar");
|
||||
println!("cargo::rustc-link-search=foo");
|
||||
println!("cargo::rustc-link-lib=static=foo");
|
||||
println!("cargo::rustc-link-lib=bar");
|
||||
println!("cargo::rustc-link-search=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -2318,7 +2318,7 @@ fn build_script_with_dynamic_native_dependency() {
|
|||
fs::copy(root.join("builder.dll.lib"),
|
||||
out_dir.join("builder.dll.lib")).unwrap();
|
||||
}
|
||||
println!("cargo:rustc-link-search=native={}", out_dir.display());
|
||||
println!("cargo::rustc-link-search=native={}", out_dir.display());
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -2486,7 +2486,7 @@ fn cfg_feedback() {
|
|||
.file("src/main.rs", "#[cfg(foo)] fn main() {}")
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-cfg=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-cfg=foo"); }"#,
|
||||
)
|
||||
.build();
|
||||
p.cargo("build -v").run();
|
||||
|
|
@ -2540,7 +2540,7 @@ fn cfg_test() {
|
|||
)
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-cfg=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-cfg=foo"); }"#,
|
||||
)
|
||||
.file(
|
||||
"src/lib.rs",
|
||||
|
|
@ -2605,7 +2605,7 @@ fn cfg_doc() {
|
|||
)
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-cfg=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-cfg=foo"); }"#,
|
||||
)
|
||||
.file("src/lib.rs", "#[cfg(foo)] pub fn foo() {}")
|
||||
.file(
|
||||
|
|
@ -2620,7 +2620,7 @@ fn cfg_doc() {
|
|||
)
|
||||
.file(
|
||||
"bar/build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-cfg=bar"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-cfg=bar"); }"#,
|
||||
)
|
||||
.file("bar/src/lib.rs", "#[cfg(bar)] pub fn bar() {}")
|
||||
.build();
|
||||
|
|
@ -2773,7 +2773,7 @@ fn env_build() {
|
|||
)
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-env=FOO=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-env=FOO=foo"); }"#,
|
||||
)
|
||||
.build();
|
||||
p.cargo("build -v").run();
|
||||
|
|
@ -2795,7 +2795,7 @@ fn env_test() {
|
|||
)
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-env=FOO=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-env=FOO=foo"); }"#,
|
||||
)
|
||||
.file(
|
||||
"src/lib.rs",
|
||||
|
|
@ -2855,7 +2855,7 @@ fn env_doc() {
|
|||
)
|
||||
.file(
|
||||
"build.rs",
|
||||
r#"fn main() { println!("cargo:rustc-env=FOO=foo"); }"#,
|
||||
r#"fn main() { println!("cargo::rustc-env=FOO=foo"); }"#,
|
||||
)
|
||||
.build();
|
||||
p.cargo("doc -v").run();
|
||||
|
|
@ -2905,7 +2905,7 @@ fn flags_go_into_tests() {
|
|||
"a/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=test");
|
||||
println!("cargo::rustc-link-search=test");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -2999,7 +2999,7 @@ fn diamond_passes_args_only_once() {
|
|||
"c/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=native=test");
|
||||
println!("cargo::rustc-link-search=native=test");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3046,7 +3046,7 @@ fn adding_an_override_invalidates() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=native=foo");
|
||||
println!("cargo::rustc-link-search=native=foo");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3274,8 +3274,8 @@ fn generate_good_d_files() {
|
|||
"awoo/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
println!("cargo:rerun-if-changed=barkbarkbark");
|
||||
println!("cargo::rerun-if-changed=build.rs");
|
||||
println!("cargo::rerun-if-changed=barkbarkbark");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3353,8 +3353,8 @@ fn generate_good_d_files_for_external_tools() {
|
|||
"awoo/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
println!("cargo:rerun-if-changed=barkbarkbark");
|
||||
println!("cargo::rerun-if-changed=build.rs");
|
||||
println!("cargo::rerun-if-changed=barkbarkbark");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3415,8 +3415,8 @@ fn rebuild_only_on_explicit_paths() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=foo");
|
||||
println!("cargo:rerun-if-changed=bar");
|
||||
println!("cargo::rerun-if-changed=foo");
|
||||
println!("cargo::rerun-if-changed=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3543,7 +3543,7 @@ fn doctest_receives_build_link_args() {
|
|||
"a/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=native=bar");
|
||||
println!("cargo::rustc-link-search=native=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3577,7 +3577,7 @@ fn please_respect_the_dag() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=native=foo");
|
||||
println!("cargo::rustc-link-search=native=foo");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3597,7 +3597,7 @@ fn please_respect_the_dag() {
|
|||
"a/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=native=bar");
|
||||
println!("cargo::rustc-link-search=native=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3632,7 +3632,7 @@ fn non_utf8_output() {
|
|||
out.write_all(b"\xff\xff\n").unwrap();
|
||||
|
||||
// now print some cargo metadata that's utf8
|
||||
println!("cargo:rustc-cfg=foo");
|
||||
println!("cargo::rustc-cfg=foo");
|
||||
|
||||
// now print more non-utf8
|
||||
out.write_all(b"\xff\xff\n").unwrap();
|
||||
|
|
@ -3765,8 +3765,8 @@ fn warnings_emitted() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:warning=foo");
|
||||
println!("cargo:warning=bar");
|
||||
println!("cargo::warning=foo");
|
||||
println!("cargo::warning=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3805,8 +3805,8 @@ fn warnings_emitted_when_build_script_panics() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:warning=foo");
|
||||
println!("cargo:warning=bar");
|
||||
println!("cargo::warning=foo");
|
||||
println!("cargo::warning=bar");
|
||||
panic!();
|
||||
}
|
||||
"#,
|
||||
|
|
@ -3827,8 +3827,8 @@ fn warnings_hidden_for_upstream() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:warning=foo");
|
||||
println!("cargo:warning=bar");
|
||||
println!("cargo::warning=foo");
|
||||
println!("cargo::warning=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -3886,8 +3886,8 @@ fn warnings_printed_on_vv() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:warning=foo");
|
||||
println!("cargo:warning=bar");
|
||||
println!("cargo::warning=foo");
|
||||
println!("cargo::warning=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4003,7 +4003,7 @@ fn links_with_dots() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-link-search=bar")
|
||||
println!("cargo::rustc-link-search=bar")
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4158,7 +4158,7 @@ fn assume_build_script_when_build_rs_present() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-cfg=foo");
|
||||
println!("cargo::rustc-cfg=foo");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4194,7 +4194,7 @@ fn if_build_set_to_false_dont_treat_build_rs_as_build_script() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-cfg=foo");
|
||||
println!("cargo::rustc-cfg=foo");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4223,7 +4223,7 @@ fn deterministic_rustc_dependency_flags() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-L native=test1");
|
||||
println!("cargo::rustc-flags=-L native=test1");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4244,7 +4244,7 @@ fn deterministic_rustc_dependency_flags() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-L native=test2");
|
||||
println!("cargo::rustc-flags=-L native=test2");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4265,7 +4265,7 @@ fn deterministic_rustc_dependency_flags() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-L native=test3");
|
||||
println!("cargo::rustc-flags=-L native=test3");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4286,7 +4286,7 @@ fn deterministic_rustc_dependency_flags() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-flags=-L native=test4");
|
||||
println!("cargo::rustc-flags=-L native=test4");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4457,13 +4457,13 @@ fn _rename_with_link_search_path(cross: bool) {
|
|||
// handle windows, like below
|
||||
drop(fs::copy(root.join("foo.dll.lib"), dst_dir.join("foo.dll.lib")));
|
||||
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
println!("cargo::rerun-if-changed=build.rs");
|
||||
if cfg!(target_env = "msvc") {
|
||||
println!("cargo:rustc-link-lib=foo.dll");
|
||||
println!("cargo::rustc-link-lib=foo.dll");
|
||||
} else {
|
||||
println!("cargo:rustc-link-lib=foo");
|
||||
println!("cargo::rustc-link-lib=foo");
|
||||
}
|
||||
println!("cargo:rustc-link-search=all={}",
|
||||
println!("cargo::rustc-link-search=all={}",
|
||||
dst.parent().unwrap().display());
|
||||
}
|
||||
"#,
|
||||
|
|
@ -4576,10 +4576,10 @@ fn optional_build_script_dep() {
|
|||
|
||||
fn main() {
|
||||
#[cfg(feature = "bar")] {
|
||||
println!("cargo:rustc-env=FOO={}", bar::bar());
|
||||
println!("cargo::rustc-env=FOO={}", bar::bar());
|
||||
return
|
||||
}
|
||||
println!("cargo:rustc-env=FOO=0");
|
||||
println!("cargo::rustc-env=FOO=0");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4680,7 +4680,7 @@ fn using_rerun_if_changed_does_not_rebuild() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
println!("cargo::rerun-if-changed=build.rs");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4718,7 +4718,7 @@ fn links_interrupted_can_restart() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-env-changed=SOMEVAR");
|
||||
println!("cargo::rerun-if-env-changed=SOMEVAR");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4747,7 +4747,7 @@ fn links_interrupted_can_restart() {
|
|||
r#"
|
||||
use std::env;
|
||||
fn main() {
|
||||
println!("cargo:rebuild-if-changed=build.rs");
|
||||
println!("cargo::metadata=rebuild-if-changed=build.rs");
|
||||
if std::path::Path::new("abort").exists() {
|
||||
panic!("Crash!");
|
||||
}
|
||||
|
|
@ -4825,7 +4825,7 @@ fn rerun_if_directory() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=somedir");
|
||||
println!("cargo::rerun-if-changed=somedir");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4944,7 +4944,7 @@ fn rerun_if_published_directory() {
|
|||
r#"
|
||||
fn main() {
|
||||
// Changing to mylib/balrog.c will not trigger a rebuild
|
||||
println!("cargo:rerun-if-changed=mylib");
|
||||
println!("cargo::rerun-if-changed=mylib");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -4989,7 +4989,7 @@ fn rerun_if_published_directory() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=mylib");
|
||||
println!("cargo::rerun-if-changed=mylib");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -5048,7 +5048,7 @@ fn test_with_dep_metadata() {
|
|||
"bar/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:foo=bar");
|
||||
println!("cargo::metadata=foo=bar");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -5111,8 +5111,8 @@ fn duplicate_script_with_extra_env() {
|
|||
"foo/build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:rustc-env=CRATE_TARGET={}", std::env::var("TARGET").unwrap());
|
||||
println!("cargo:rustc-cfg=mycfg=\"{}\"", std::env::var("TARGET").unwrap());
|
||||
println!("cargo::rustc-env=CRATE_TARGET={}", std::env::var("TARGET").unwrap());
|
||||
println!("cargo::rustc-cfg=mycfg=\"{}\"", std::env::var("TARGET").unwrap());
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -5157,7 +5157,7 @@ fn wrong_output() {
|
|||
"build.rs",
|
||||
r#"
|
||||
fn main() {
|
||||
println!("cargo:example");
|
||||
println!("cargo::example");
|
||||
}
|
||||
"#,
|
||||
)
|
||||
|
|
@ -5168,8 +5168,8 @@ fn wrong_output() {
|
|||
.with_stderr(
|
||||
"\
|
||||
[COMPILING] foo [..]
|
||||
error: invalid output in build script of `foo v0.0.1 ([ROOT]/foo)`: `cargo:example`
|
||||
Expected a line with `cargo:KEY=VALUE` with an `=` character, but none was found.
|
||||
error: invalid output in build script of `foo v0.0.1 ([ROOT]/foo)`: `cargo::example`
|
||||
Expected a line with `cargo::KEY=VALUE` with an `=` character, but none was found.
|
||||
See https://doc.rust-lang.org/cargo/reference/build-scripts.html#outputs-of-the-build-script \
|
||||
for more information about build script outputs.
|
||||
",
|
||||
|
|
|
|||
Loading…
Reference in a new issue