Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions tests/build-std/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ fn cross_custom() {
.file("custom-target.json", target_spec_json())
.build();

p.cargo("build --target custom-target.json -v -Zjson-target-spec")
p.cargo("build --target custom-target.json -v")
.arg("-Zjson-target-spec")
.masquerade_as_nightly_cargo(&["json_target_spec"])
.build_std_arg("core")
.run();
Expand Down Expand Up @@ -354,7 +355,8 @@ fn custom_test_framework() {
paths.insert(0, sysroot_bin);
let new_path = env::join_paths(paths).unwrap();

p.cargo("test --target target.json --no-run -v -Zjson-target-spec")
p.cargo("test --target target.json --no-run -v")
.arg("-Zjson-target-spec")
.masquerade_as_nightly_cargo(&["json_target_spec"])
.env("PATH", new_path)
.build_std_arg("core")
Expand Down Expand Up @@ -385,7 +387,8 @@ fn remap_path_scope() {
)
.build();

p.cargo("run --release -Ztrim-paths")
p.cargo("run --release")
.arg("-Ztrim-paths")
.masquerade_as_nightly_cargo(&["-Ztrim-paths"])
.env("RUST_BACKTRACE", "1")
.build_std()
Expand Down
3 changes: 2 additions & 1 deletion tests/testsuite/advanced_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ fn source_config_env() {

let path = paths::root().join("registry");

p.cargo("check -Zadvanced-env")
p.cargo("check")
.arg("-Zadvanced-env")
.masquerade_as_nightly_cargo(&["advanced-env"])
.env("CARGO_SOURCE_crates-io_REPLACE_WITH", "my-local-source")
.env("CARGO_SOURCE_my-local-source_LOCAL_REGISTRY", path)
Expand Down
Loading