Skip to content

Commit afed862

Browse files
committed
tests: use renamed stdin_buf
1 parent 2031eac commit afed862

File tree

17 files changed

+33
-23
lines changed

17 files changed

+33
-23
lines changed

Diff for: tests/run-make/clear-error-blank-output/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
use run_make_support::rustc;
99

1010
fn main() {
11-
let output = rustc().output("").stdin(b"fn main() {}").run_fail();
11+
let output = rustc().output("").stdin_buf(b"fn main() {}").run_fail();
1212
output.assert_stderr_not_contains("panic");
1313
}

Diff for: tests/run-make/comment-section/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn main() {
1414

1515
rustc()
1616
.arg("-")
17-
.stdin("fn main() {}")
17+
.stdin_buf("fn main() {}")
1818
.emit("link,obj")
1919
.arg("-Csave-temps")
2020
.target(target)

Diff for: tests/run-make/compile-stdin/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
use run_make_support::{run, rustc};
99

1010
fn main() {
11-
rustc().arg("-").stdin("fn main() {}").run();
11+
rustc().arg("-").stdin_buf("fn main() {}").run();
1212
run("rust_out");
1313
}

Diff for: tests/run-make/libtest-junit/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn run_tests(extra_args: &[&str], expected_file: &str) {
2121
.run_fail();
2222
let test_stdout = &cmd_out.stdout_utf8();
2323

24-
python_command().arg("validate_junit.py").stdin(test_stdout).run();
24+
python_command().arg("validate_junit.py").stdin_buf(test_stdout).run();
2525

2626
diff()
2727
.expected_file(expected_file)

Diff for: tests/run-make/llvm-ident/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn main() {
1717
.codegen_units(16)
1818
.opt_level("2")
1919
.target(&env_var("TARGET"))
20-
.stdin("fn main(){}")
20+
.stdin_buf("fn main(){}")
2121
.run();
2222

2323
// `llvm-dis` is used here since `--emit=llvm-ir` does not emit LLVM IR

Diff for: tests/run-make/llvm-outputs/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ fn main() {
1111
let p = cwd();
1212
path_bc = p.join("nonexistant_dir_bc");
1313
path_ir = p.join("nonexistant_dir_ir");
14-
rustc().input("-").stdin("fn main() {}").out_dir(&path_bc).emit("llvm-bc").run();
15-
rustc().input("-").stdin("fn main() {}").out_dir(&path_ir).emit("llvm-ir").run();
14+
rustc().input("-").stdin_buf("fn main() {}").out_dir(&path_bc).emit("llvm-bc").run();
15+
rustc().input("-").stdin_buf("fn main() {}").out_dir(&path_ir).emit("llvm-ir").run();
1616
assert!(path_bc.exists());
1717
assert!(path_ir.exists());
1818
});

Diff for: tests/run-make/no-builtins-attribute/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ use run_make_support::{llvm_filecheck, rfs, rustc};
99
fn main() {
1010
rustc().input("no_builtins.rs").emit("link").run();
1111
rustc().input("main.rs").emit("llvm-ir").run();
12-
llvm_filecheck().patterns("filecheck.main.txt").stdin(rfs::read("main.ll")).run();
12+
llvm_filecheck().patterns("filecheck.main.txt").stdin_buf(rfs::read("main.ll")).run();
1313
}

Diff for: tests/run-make/pgo-branch-weights/rmake.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@ fn main() {
3535
.codegen_units(1)
3636
.emit("llvm-ir")
3737
.run();
38-
llvm_filecheck().patterns("filecheck-patterns.txt").stdin(rfs::read("interesting.ll")).run();
38+
llvm_filecheck()
39+
.patterns("filecheck-patterns.txt")
40+
.stdin_buf(rfs::read("interesting.ll"))
41+
.run();
3942
}

Diff for: tests/run-make/pgo-indirect-call-promotion/rmake.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@ fn main() {
2929
.codegen_units(1)
3030
.emit("llvm-ir")
3131
.run();
32-
llvm_filecheck().patterns("filecheck-patterns.txt").stdin(rfs::read("interesting.ll")).run();
32+
llvm_filecheck()
33+
.patterns("filecheck-patterns.txt")
34+
.stdin_buf(rfs::read("interesting.ll"))
35+
.run();
3336
}

Diff for: tests/run-make/pgo-use/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ fn main() {
5151
let lines: Vec<_> = ir.lines().rev().collect();
5252
let mut reversed_ir = lines.join("\n");
5353
reversed_ir.push('\n');
54-
llvm_filecheck().patterns("filecheck-patterns.txt").stdin(reversed_ir.as_bytes()).run();
54+
llvm_filecheck().patterns("filecheck-patterns.txt").stdin_buf(reversed_ir.as_bytes()).run();
5555
}

Diff for: tests/run-make/separate-link/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use run_make_support::{run, rustc};
99

1010
fn main() {
11-
rustc().stdin(b"fn main(){}").arg("-Zno-link").arg("-").run();
11+
rustc().stdin_buf(b"fn main(){}").arg("-Zno-link").arg("-").run();
1212
rustc().arg("-Zlink-only").input("rust_out.rlink").run();
1313
run("rust_out");
1414
}

Diff for: tests/run-make/static-pie/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn ok_compiler_version(compiler: &str) -> bool {
2828
}
2929

3030
let compiler_output =
31-
cmd(compiler).stdin(trigger).arg("-").arg("-E").arg("-x").arg("c").run().stdout_utf8();
31+
cmd(compiler).stdin_buf(trigger).arg("-").arg("-E").arg("-x").arg("c").run().stdout_utf8();
3232
let re = Regex::new(r"(?m)^(\d+)").unwrap();
3333
let version: u32 =
3434
re.captures(&compiler_output).unwrap().get(1).unwrap().as_str().parse().unwrap();

Diff for: tests/run-make/stdin-rustc/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ const NOT_UTF8: &[u8] = &[0xff, 0xff, 0xff];
1414

1515
fn main() {
1616
// echo $HELLO_WORLD | rustc -
17-
rustc().arg("-").stdin(HELLO_WORLD).run();
17+
rustc().arg("-").stdin_buf(HELLO_WORLD).run();
1818
assert!(
1919
PathBuf::from(if !is_windows() { "rust_out" } else { "rust_out.exe" })
2020
.try_exists()
2121
.unwrap()
2222
);
2323

2424
// echo $NOT_UTF8 | rustc -
25-
rustc().arg("-").stdin(NOT_UTF8).run_fail().assert_stderr_contains(
25+
rustc().arg("-").stdin_buf(NOT_UTF8).run_fail().assert_stderr_contains(
2626
"error: couldn't read from stdin, as it did not contain valid UTF-8",
2727
);
2828
}

Diff for: tests/run-make/stdin-rustdoc/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ fn main() {
1515
let out_dir = PathBuf::from("doc");
1616

1717
// rustdoc -
18-
rustdoc().arg("-").out_dir(&out_dir).stdin(INPUT).run();
18+
rustdoc().arg("-").out_dir(&out_dir).stdin_buf(INPUT).run();
1919
assert!(out_dir.join("rust_out/struct.F.html").try_exists().unwrap());
2020

2121
// rustdoc --test -
22-
rustdoc().arg("--test").arg("-").stdin(INPUT).run();
22+
rustdoc().arg("--test").arg("-").stdin_buf(INPUT).run();
2323

2424
// rustdoc file.rs -
2525
rustdoc().arg("file.rs").arg("-").run_fail();

Diff for: tests/run-make/sysroot-crates-are-unstable/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn check_crate_is_unstable(cr: &Crate) {
3434
.target(target())
3535
.extern_(name, path)
3636
.input("-")
37-
.stdin(format!("extern crate {name};"))
37+
.stdin_buf(format!("extern crate {name};"))
3838
.run_fail();
3939

4040
// Make sure it failed for the intended reason, not some other reason.

Diff for: tests/run-make/unknown-mod-stdin/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use run_make_support::{diff, rustc};
1313

1414
fn main() {
15-
let out = rustc().crate_type("rlib").stdin(b"mod unknown;").arg("-").run_fail();
15+
let out = rustc().crate_type("rlib").stdin_buf(b"mod unknown;").arg("-").run_fail();
1616
diff()
1717
.actual_text("actual-stdout", out.stdout_utf8())
1818
.expected_file("unknown-mod.stdout")

Diff for: tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rmake.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,23 @@ fn check(func_re: &str, mut checks: &str) {
7878
// This is because frame pointers are optional, and them being enabled requires
7979
// an additional `popq` in the pattern checking file.
8080
if func_re == "std::io::stdio::_print::[[:alnum:]]+" {
81-
let output = llvm_filecheck().stdin(&dump).patterns(checks).run_unchecked();
81+
let output = llvm_filecheck().stdin_buf(&dump).patterns(checks).run_unchecked();
8282
if !output.status().success() {
8383
checks = "print.without_frame_pointers.checks";
84-
llvm_filecheck().stdin(&dump).patterns(checks).run();
84+
llvm_filecheck().stdin_buf(&dump).patterns(checks).run();
8585
}
8686
} else {
87-
llvm_filecheck().stdin(&dump).patterns(checks).run();
87+
llvm_filecheck().stdin_buf(&dump).patterns(checks).run();
8888
}
8989
if !["rust_plus_one_global_asm", "cmake_plus_one_c_global_asm", "cmake_plus_one_cxx_global_asm"]
9090
.contains(&func_re)
9191
{
9292
// The assembler cannot avoid explicit `ret` instructions. Sequences
9393
// of `shlq $0x0, (%rsp); lfence; retq` are used instead.
94-
llvm_filecheck().args(&["--implicit-check-not", "ret"]).stdin(dump).patterns(checks).run();
94+
llvm_filecheck()
95+
.args(&["--implicit-check-not", "ret"])
96+
.stdin_buf(dump)
97+
.patterns(checks)
98+
.run();
9599
}
96100
}

0 commit comments

Comments
 (0)