From acd6ce2347b80fedfc52df0c2a64127535e186f3 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Fri, 6 Nov 2020 18:01:50 -0500
Subject: [PATCH] Fix bugs

---
 src/tools/compiletest/src/main.rs     | 2 +-
 src/tools/compiletest/src/runtest.rs  | 4 +++-
 src/tools/compiletest/tidy-rustdoc.sh | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 2b167ac8e9fb..32347db5dbb1 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -379,7 +379,7 @@ pub fn run_tests(config: Config) {
         }
         Err(e) => {
             // We don't know if tests passed or not, but if there was an error
-            // during testing we don't want to just suceeed (we may not have
+            // during testing we don't want to just succeed (we may not have
             // tested something), so fail.
             //
             // This should realistically "never" happen, so don't try to make
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 59c650d94cdc..8a0d671ed559 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2394,12 +2394,14 @@ impl<'test> TestCx<'test> {
             .stdout(Stdio::piped())
             .spawn()
             .expect("failed to run `diff`");
-        Command::new("delta")
+        let status = Command::new("delta")
+            .arg("--paging=never")
             .stdin(diff_pid.stdout.unwrap())
             .spawn()
             .expect("delta not found")
             .wait()
             .unwrap();
+        assert!(status.success());
     }
 
     fn get_lines<P: AsRef<Path>>(
diff --git a/src/tools/compiletest/tidy-rustdoc.sh b/src/tools/compiletest/tidy-rustdoc.sh
index b31957058e8c..407e9169af54 100755
--- a/src/tools/compiletest/tidy-rustdoc.sh
+++ b/src/tools/compiletest/tidy-rustdoc.sh
@@ -14,8 +14,7 @@ tidy () {
       --quiet yes \
       "$@" \
       >/dev/null \
-  # tidy exits with code 1 if there were any warnings
-  || [ $? -eq 1 ]
+  || [ $? -eq 1 ] # tidy exits with code 1 if there were any warnings
 }
 
 find "$indir" -type f -name '*.html' -print0 \