[llvm] r374679 - Revert r374652: "[lit] Fix internal diff's --strip-trailing-cr and use it"
Joel E. Denny via llvm-commits
llvm-commits at lists.llvm.org
Sat Oct 12 11:51:51 PDT 2019
Author: jdenny
Date: Sat Oct 12 11:51:51 2019
New Revision: 374679
URL: http://llvm.org/viewvc/llvm-project?rev=374679&view=rev
Log:
Revert r374652: "[lit] Fix internal diff's --strip-trailing-cr and use it"
This series of patches still breaks a Windows bot.
Removed:
llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.dos
llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.unix
llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt
Modified:
llvm/trunk/test/MC/AsmParser/preserve-comments.s
llvm/trunk/test/tools/llvm-cxxmap/remap.test
llvm/trunk/test/tools/llvm-profdata/profile-symbol-list.test
llvm/trunk/test/tools/llvm-profdata/roundtrip.test
llvm/trunk/test/tools/llvm-profdata/sample-remap.test
llvm/trunk/utils/lit/lit/builtin_commands/diff.py
llvm/trunk/utils/lit/tests/max-failures.py
llvm/trunk/utils/lit/tests/shtest-shell.py
Modified: llvm/trunk/test/MC/AsmParser/preserve-comments.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/preserve-comments.s?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/preserve-comments.s (original)
+++ llvm/trunk/test/MC/AsmParser/preserve-comments.s Sat Oct 12 11:51:51 2019
@@ -1,5 +1,5 @@
#RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t
- #RUN: diff --strip-trailing-cr %s %t
+ #RUN: diff %s %t
.text
foo: #Comment here
Modified: llvm/trunk/test/tools/llvm-cxxmap/remap.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cxxmap/remap.test?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cxxmap/remap.test (original)
+++ llvm/trunk/test/tools/llvm-cxxmap/remap.test Sat Oct 12 11:51:51 2019
@@ -1,5 +1,5 @@
RUN: llvm-cxxmap %S/Inputs/before.sym %S/Inputs/after.sym -r %S/Inputs/remap.map -o %t.output -Wambiguous -Wincomplete 2>&1 | FileCheck %s --allow-empty
-RUN: diff --strip-trailing-cr %S/Inputs/expected %t.output
+RUN: diff %S/Inputs/expected %t.output
CHECK-NOT: warning
CHECK-NOT: error
Modified: llvm/trunk/test/tools/llvm-profdata/profile-symbol-list.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/profile-symbol-list.test?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/profile-symbol-list.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/profile-symbol-list.test Sat Oct 12 11:51:51 2019
@@ -2,4 +2,4 @@
; RUN: llvm-profdata merge -sample -extbinary -prof-sym-list=%S/Inputs/profile-symbol-list-2.text %S/Inputs/sample-profile.proftext -o %t.2.output
; RUN: llvm-profdata merge -sample -extbinary %t.1.output %t.2.output -o %t.3.output
; RUN: llvm-profdata show -sample -show-prof-sym-list %t.3.output > %t.4.output
-; RUN: diff --strip-trailing-cr %S/Inputs/profile-symbol-list.expected %t.4.output
+; RUN: diff %S/Inputs/profile-symbol-list.expected %t.4.output
Modified: llvm/trunk/test/tools/llvm-profdata/roundtrip.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/roundtrip.test?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/roundtrip.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/roundtrip.test Sat Oct 12 11:51:51 2019
@@ -1,18 +1,18 @@
RUN: llvm-profdata merge -o %t.0.profdata %S/Inputs/IR_profile.proftext
RUN: llvm-profdata show -o %t.0.proftext -all-functions -text %t.0.profdata
-RUN: diff --strip-trailing-cr %t.0.proftext %S/Inputs/IR_profile.proftext
+RUN: diff %t.0.proftext %S/Inputs/IR_profile.proftext
RUN: llvm-profdata merge -o %t.1.profdata %t.0.proftext
RUN: llvm-profdata show -o %t.1.proftext -all-functions -text %t.1.profdata
-RUN: diff --strip-trailing-cr %t.1.proftext %S/Inputs/IR_profile.proftext
+RUN: diff %t.1.proftext %S/Inputs/IR_profile.proftext
RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --text -output=%t.2.proftext %t.2.profdata
-RUN: diff --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext
+RUN: diff %t.2.proftext %S/Inputs/sample-profile.proftext
# Round trip from text --> extbinary --> text
RUN: llvm-profdata merge --sample --extbinary -output=%t.3.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --text -output=%t.3.proftext %t.3.profdata
-RUN: diff --strip-trailing-cr %t.3.proftext %S/Inputs/sample-profile.proftext
+RUN: diff %t.3.proftext %S/Inputs/sample-profile.proftext
# Round trip from text --> binary --> extbinary --> text
RUN: llvm-profdata merge --sample --binary -output=%t.4.profdata %S/Inputs/sample-profile.proftext
RUN: llvm-profdata merge --sample --extbinary -output=%t.5.profdata %t.4.profdata
RUN: llvm-profdata merge --sample --text -output=%t.4.proftext %t.5.profdata
-RUN: diff --strip-trailing-cr %t.4.proftext %S/Inputs/sample-profile.proftext
+RUN: diff %t.4.proftext %S/Inputs/sample-profile.proftext
Modified: llvm/trunk/test/tools/llvm-profdata/sample-remap.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/sample-remap.test?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/sample-remap.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/sample-remap.test Sat Oct 12 11:51:51 2019
@@ -1,2 +1,2 @@
; RUN: llvm-profdata merge -sample -text %S/Inputs/sample-remap.proftext -r %S/Inputs/sample-remap.remap -o %t.output
-; RUN: diff --strip-trailing-cr %S/Inputs/sample-remap.expected %t.output
+; RUN: diff %S/Inputs/sample-remap.expected %t.output
Modified: llvm/trunk/utils/lit/lit/builtin_commands/diff.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/builtin_commands/diff.py?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/builtin_commands/diff.py (original)
+++ llvm/trunk/utils/lit/lit/builtin_commands/diff.py Sat Oct 12 11:51:51 2019
@@ -83,7 +83,7 @@ def compareTwoTextFiles(flags, filepaths
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 ' ')
Removed: llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.dos
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.dos?rev=374678&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.dos (original)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.dos (removed)
@@ -1,3 +0,0 @@
-In this file, the
-sequence "\r\n"
-terminates lines.
Removed: llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.unix
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.unix?rev=374678&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.unix (original)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-in.unix (removed)
@@ -1,3 +0,0 @@
-In this file, the
-sequence "\n"
-terminates lines.
Removed: llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt?rev=374678&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt (original)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt (removed)
@@ -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
Modified: llvm/trunk/utils/lit/tests/max-failures.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/max-failures.py?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/max-failures.py (original)
+++ llvm/trunk/utils/lit/tests/max-failures.py Sat Oct 12 11:51:51 2019
@@ -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'
Modified: llvm/trunk/utils/lit/tests/shtest-shell.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shtest-shell.py?rev=374679&r1=374678&r2=374679&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/shtest-shell.py (original)
+++ llvm/trunk/utils/lit/tests/shtest-shell.py Sat Oct 12 11:51:51 2019
@@ -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)
More information about the llvm-commits
mailing list