Skip to content

Commit acd6ce2

Browse files
committed
Fix bugs
1 parent c0eedc0 commit acd6ce2

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/tools/compiletest/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ pub fn run_tests(config: Config) {
379379
}
380380
Err(e) => {
381381
// We don't know if tests passed or not, but if there was an error
382-
// during testing we don't want to just suceeed (we may not have
382+
// during testing we don't want to just succeed (we may not have
383383
// tested something), so fail.
384384
//
385385
// This should realistically "never" happen, so don't try to make

src/tools/compiletest/src/runtest.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2394,12 +2394,14 @@ impl<'test> TestCx<'test> {
23942394
.stdout(Stdio::piped())
23952395
.spawn()
23962396
.expect("failed to run `diff`");
2397-
Command::new("delta")
2397+
let status = Command::new("delta")
2398+
.arg("--paging=never")
23982399
.stdin(diff_pid.stdout.unwrap())
23992400
.spawn()
24002401
.expect("delta not found")
24012402
.wait()
24022403
.unwrap();
2404+
assert!(status.success());
24032405
}
24042406

24052407
fn get_lines<P: AsRef<Path>>(

src/tools/compiletest/tidy-rustdoc.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ tidy () {
1414
--quiet yes \
1515
"$@" \
1616
>/dev/null \
17-
# tidy exits with code 1 if there were any warnings
18-
|| [ $? -eq 1 ]
17+
|| [ $? -eq 1 ] # tidy exits with code 1 if there were any warnings
1918
}
2019

2120
find "$indir" -type f -name '*.html' -print0 \

0 commit comments

Comments
 (0)