6 files changed, 4 insertions, 73 deletions
diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py
index f413f87425c..6340eacdf01 100644
--- a/llvm/utils/lit/lit/builtin_commands/diff.py
+++ b/llvm/utils/lit/lit/builtin_commands/diff.py
@@ -83,7 +83,7 @@ def compareTwoTextFiles(flags, filepaths, filelines_bin, encoding):
 
     f = lambda x: x
     if flags.strip_trailing_cr:
-        f = compose2(lambda line: line.replace('\r\n', '\n'), f)
+        f = compose2(lambda line: line.rstrip('\r'), f)
     if flags.ignore_all_space or flags.ignore_space_change:
         ignoreSpace = lambda line, separator: separator.join(line.split())
         ignoreAllSpaceOrSpaceChange = functools.partial(ignoreSpace, separator='' if flags.ignore_all_space else ' ')
diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.dos b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.dos
deleted file mode 100644
index 7a0560654c5..00000000000
--- a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.dos
+++ /dev/null
@@ -1,3 +0,0 @@
-In this file, the
-sequence "\r\n"
-terminates lines.
diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.unix b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.unix
deleted file mode 100644
index 58208a3ae76..00000000000
--- a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.unix
+++ /dev/null
@@ -1,3 +0,0 @@
-In this file, the
-sequence "\n"
-terminates lines.
diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt
deleted file mode 100644
index 6111a8fbf72..00000000000
--- a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Check behavior of --strip-trailing-cr.
-
-# RUN: diff -u diff-in.dos diff-in.unix && false || true
-# RUN: diff -u diff-in.unix diff-in.dos && false || true
-
-# RUN: diff -u --strip-trailing-cr diff-in.dos diff-in.unix && false || true
-# RUN: diff -u --strip-trailing-cr diff-in.unix diff-in.dos && false || true
-
-# Fail so lit will print output.
-# RUN: false
diff --git a/llvm/utils/lit/tests/max-failures.py b/llvm/utils/lit/tests/max-failures.py
index 6ad37533692..3b85ae18611 100644
--- a/llvm/utils/lit/tests/max-failures.py
+++ b/llvm/utils/lit/tests/max-failures.py
@@ -8,7 +8,7 @@
 #
 # END.
 
-# CHECK: Failing Tests (32)
+# CHECK: Failing Tests (31)
 # CHECK: Failing Tests (1)
 # CHECK: Failing Tests (2)
 # CHECK: error: argument --max-failures: requires positive integer, but found '0'
diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py
index adbe4dc56a1..c7e05d6bc42 100644
--- a/llvm/utils/lit/tests/shtest-shell.py
+++ b/llvm/utils/lit/tests/shtest-shell.py
@@ -4,7 +4,7 @@
 # FIXME: Temporarily dump test output so we can debug failing tests on
 # buildbots.
 # RUN: cat %t.out
-# RUN: FileCheck --dump-input=fail --color -vv --input-file %t.out %s
+# RUN: FileCheck --input-file %t.out %s
 #
 # END.
 
@@ -332,59 +332,6 @@
 # CHECK: PASS: shtest-shell :: diff-r.txt
 
 
-# CHECK: FAIL: shtest-shell :: diff-strip-trailing-cr.txt
-
-# CHECK: *** TEST 'shtest-shell :: diff-strip-trailing-cr.txt' FAILED ***
-
-# CHECK: $ "diff" "-u" "diff-in.dos" "diff-in.unix"
-# CHECK: # command output:
-# CHECK: @@
-# CHECK-NEXT: -In this file, the
-# CHECK-NEXT: -sequence "\r\n"
-# CHECK-NEXT: -terminates lines.
-# CHECK-NEXT: +In this file, the
-# CHECK-NEXT: +sequence "\n"
-# CHECK-NEXT: +terminates lines.
-# CHECK: error: command failed with exit status: 1
-# CHECK: $ "true"
-
-# CHECK: $ "diff" "-u" "diff-in.unix" "diff-in.dos"
-# CHECK: # command output:
-# CHECK: @@
-# CHECK-NEXT: -In this file, the
-# CHECK-NEXT: -sequence "\n"
-# CHECK-NEXT: -terminates lines.
-# CHECK-NEXT: +In this file, the
-# CHECK-NEXT: +sequence "\r\n"
-# CHECK-NEXT: +terminates lines.
-# CHECK: error: command failed with exit status: 1
-# CHECK: $ "true"
-
-# CHECK: $ "diff" "-u" "--strip-trailing-cr" "diff-in.dos" "diff-in.unix"
-# CHECK: # command output:
-# CHECK: @@
-# CHECK-NEXT:  In this file, the
-# CHECK-NEXT: -sequence "\r\n"
-# CHECK-NEXT: +sequence "\n"
-# CHECK-NEXT:  terminates lines.
-# CHECK: error: command failed with exit status: 1
-# CHECK: $ "true"
-
-# CHECK: $ "diff" "-u" "--strip-trailing-cr" "diff-in.unix" "diff-in.dos"
-# CHECK: # command output:
-# CHECK: @@
-# CHECK-NEXT:  In this file, the
-# CHECK-NEXT: -sequence "\n"
-# CHECK-NEXT: +sequence "\r\n"
-# CHECK-NEXT:  terminates lines.
-# CHECK: error: command failed with exit status: 1
-# CHECK: $ "true"
-
-# CHECK: $ "false"
-
-# CHECK: ***
-
-
 # CHECK: FAIL: shtest-shell :: diff-unified.txt
 
 # CHECK: *** TEST 'shtest-shell :: diff-unified.txt' FAILED ***
@@ -539,4 +486,4 @@
 # CHECK: PASS: shtest-shell :: sequencing-0.txt
 # CHECK: XFAIL: shtest-shell :: sequencing-1.txt
 # CHECK: PASS: shtest-shell :: valid-shell.txt
-# CHECK: Failing Tests (32)
+# CHECK: Failing Tests (31)