diff options
| -rw-r--r-- | llvm/utils/lit/lit/builtin_commands/diff.py | 1 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-shell.py | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/llvm/utils/lit/lit/builtin_commands/diff.py b/llvm/utils/lit/lit/builtin_commands/diff.py index f413f87425c..338a01474ac 100644 --- a/llvm/utils/lit/lit/builtin_commands/diff.py +++ b/llvm/utils/lit/lit/builtin_commands/diff.py @@ -62,6 +62,7 @@ def compareTwoBinaryFiles(flags, filepaths, filelines): func = difflib.context_diff diffs = func(filelines[0], filelines[1], filepaths[0], filepaths[1], n = flags.num_context_lines) + diffs = [diff.decode(errors="ignore") for diff in diffs] for diff in diffs: sys.stdout.write(diff) diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index 9a6f2aac0a4..fb290f52b5f 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -48,7 +48,7 @@ # CHECK-NEXT: @@ # CHECK-NEXT: {{^ .f.o.o.$}} # CHECK-NEXT: {{^-.b.a.r.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} +# CHECK-NEXT: {{^\+.b.a.r.}} # CHECK-NEXT: {{^ .b.a.z.$}} # CHECK: error: command failed with exit status: 1 # CHECK: $ "true" @@ -62,7 +62,7 @@ # CHECK-NEXT: -bar # CHECK-NEXT: -baz # CHECK-NEXT: {{^\+.f.o.o.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} +# CHECK-NEXT: {{^\+.b.a.r.}} # CHECK-NEXT: {{^\+.b.a.z.$}} # CHECK: error: command failed with exit status: 1 # CHECK: $ "true" @@ -73,7 +73,7 @@ # CHECK-NEXT: +++ # CHECK-NEXT: @@ # CHECK-NEXT: {{^\-.f.o.o.$}} -# CHECK-NEXT: {{^\-.b.a.r..}} +# CHECK-NEXT: {{^\-.b.a.r.}} # CHECK-NEXT: {{^\-.b.a.z.$}} # CHECK-NEXT: +foo # CHECK-NEXT: +bar @@ -100,7 +100,7 @@ # CHECK-NEXT: @@ # CHECK-NEXT: {{^ .f.o.o.$}} # CHECK-NEXT: {{^-.b.a.r.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} +# CHECK-NEXT: {{^\+.b.a.r.}} # CHECK-NEXT: {{^ .b.a.z.$}} # CHECK: error: command failed with exit status: 1 # CHECK: $ "true" @@ -116,7 +116,7 @@ # CHECK-NEXT: -bar # CHECK-NEXT: -baz # CHECK-NEXT: {{^\+.f.o.o.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} +# CHECK-NEXT: {{^\+.b.a.r.}} # CHECK-NEXT: {{^\+.b.a.z.$}} # CHECK: error: command failed with exit status: 1 # CHECK: $ "true" @@ -127,7 +127,7 @@ # CHECK-NEXT: +++ # CHECK-NEXT: @@ # CHECK-NEXT: {{^\-.f.o.o.$}} -# CHECK-NEXT: {{^\-.b.a.r..}} +# CHECK-NEXT: {{^\-.b.a.r.}} # CHECK-NEXT: {{^\-.b.a.z.$}} # CHECK-NEXT: +foo # CHECK-NEXT: +bar |
