Skip to content

Commit ca95f78

Browse files
committed
tests/run-make: update tests to use new API
1 parent 54e7044 commit ca95f78

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

tests/run-make/compiler-builtins/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn main() {
3535
let rustc = env_var("RUSTC");
3636
let bootstrap_cargo = env_var("BOOTSTRAP_CARGO");
3737
let mut cmd = cmd(bootstrap_cargo);
38-
cmd.args([
38+
cmd.args(&[
3939
"build",
4040
"--manifest-path",
4141
manifest_path.to_str().unwrap(),

tests/run-make/rustdoc-map-file/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ fn main() {
99
.output(&out_dir)
1010
.run();
1111
// FIXME (GuillaumeGomez): Port the python script to Rust as well.
12-
assert!(python_command().arg("validate_json.py").arg(&out_dir).status().unwrap().success());
12+
python_command().arg("validate_json.py").arg(&out_dir).run();
1313
}

tests/run-make/rustdoc-scrape-examples-macros/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ fn main() {
5656
.arg(&ex_dir)
5757
.run();
5858

59-
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
59+
htmldocck().arg(out_dir).arg("src/lib.rs").run();
6060
}

tests/run-make/rustdoc-scrape-examples-remap/scrape.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ pub fn scrape(extra_args: &[&str]) {
4545
}
4646
rustdoc.run();
4747

48-
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
48+
htmldocck().arg(out_dir).arg("src/lib.rs").run();
4949
}

tests/run-make/rustdoc-themes/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ fn main() {
2828
std::fs::write(&test_css, test_content).unwrap();
2929

3030
rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run();
31-
assert!(htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success());
31+
htmldocck().arg(out_dir).arg("foo.rs").run();
3232
}

tests/run-make/rustdoc-with-out-dir-option/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ use run_make_support::{htmldocck, rustdoc};
33
fn main() {
44
let out_dir = "rustdoc";
55
rustdoc().input("src/lib.rs").crate_name("foobar").crate_type("lib").output(&out_dir).run();
6-
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
6+
htmldocck().arg(out_dir).arg("src/lib.rs").run();
77
}

tests/run-make/rustdoc-with-output-option/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ fn main() {
1212
.arg(&out_dir)
1313
.run();
1414

15-
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
15+
htmldocck().arg(out_dir).arg("src/lib.rs").run();
1616
}

tests/run-make/rustdoc-with-short-out-dir-option/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ fn main() {
1212
.arg(&out_dir)
1313
.run();
1414

15-
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
15+
htmldocck().arg(out_dir).arg("src/lib.rs").run();
1616
}

0 commit comments

Comments
 (0)