RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-01 21:04:04 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

Revert r374652: "[lit] Fix internal diff's --strip-trailing-cr and use it"

Browse Source 
This series of patches still breaks a Windows bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374679 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Joel E. Denny
2019-10-12 18:51:51 +00:00
parent 672549cb42
commit 24feaedf06
11 changed files with 13 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/MC/AsmParser/preserve-comments.s
+1 -1
View File
@@ -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
test/tools/llvm-cxxmap/remap.test
+1 -1
View File
@@ -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
test/tools/llvm-profdata/profile-symbol-list.test
+1 -1
View File
@@ -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
test/tools/llvm-profdata/roundtrip.test
+5 -5
View File
@@ -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
test/tools/llvm-profdata/sample-remap.test
+1 -1
View File
@@ -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
utils/lit/lit/builtin_commands/diff.py
+1 -1
View File
@@ -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 ' ')
utils/lit/tests/Inputs/shtest-shell/diff-in.dos
-3
View File
@@ -1,3 +0,0 @@
In this file, the
sequence "\r\n"
terminates lines.
utils/lit/tests/Inputs/shtest-shell/diff-in.unix
-3
View File
@@ -1,3 +0,0 @@
In this file, the
sequence "\n"
terminates lines.
utils/lit/tests/Inputs/shtest-shell/diff-strip-trailing-cr.txt
-10
View File
@@ -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
utils/lit/tests/max-failures.py
+1 -1
View File
@@ -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'
utils/lit/tests/shtest-shell.py
+2 -55
View File
@@ -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)