Skip to content

Commit b470c91

Browse files
authored
Merge pull request #114 from vadimb892/make-1
READY: [make] revert plib/testing and process Cargo.toml changes
2 parents 66f9f58 + 1cfe9cc commit b470c91

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

make/tests/integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ mod target_behavior {
380380
run_test_helper(
381381
&["-f", "tests/makefiles/target_behavior/no_targets.mk"],
382382
"",
383-
"make: parse error: *** No targets. Stop.\n\n",
383+
"make: no targets to execute\n",
384384
6,
385385
);
386386
}

plib/src/testing.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ pub fn run_test(plan: TestPlan) {
8484
let stdout = String::from_utf8_lossy(&output.stdout);
8585
assert_eq!(stdout, plan.expected_out);
8686

87+
let stderr = String::from_utf8_lossy(&output.stderr);
88+
assert_eq!(stderr, plan.expected_err);
89+
8790
assert_eq!(output.status.code(), Some(plan.expected_exit_code));
8891
if plan.expected_exit_code == 0 {
8992
assert!(output.status.success());

process/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bindgen = { version = "0.70.0", features = ["runtime"] }
2323
workspace = true
2424

2525
[dev-dependencies]
26-
sysinfo = "0.32"
26+
sysinfo = "0.31"
2727

2828

2929
[[bin]]

0 commit comments

Comments
 (0)