2013-02-01 06:15:20 +08:00
|
|
|
# Check the internal shell handling component of the ShTest format.
|
|
|
|
#
|
|
|
|
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out
|
2017-07-29 00:24:18 +08:00
|
|
|
# FIXME: Temporarily dump test output so we can debug failing tests on
|
|
|
|
# buildbots.
|
|
|
|
# RUN: cat %t.out
|
2019-10-13 02:51:51 +08:00
|
|
|
# RUN: FileCheck --input-file %t.out %s
|
2013-02-01 06:15:20 +08:00
|
|
|
#
|
|
|
|
# END.
|
|
|
|
|
|
|
|
# CHECK: -- Testing:
|
|
|
|
|
2018-03-27 02:05:12 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: cat-error-0.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: cat-error-0.txt' FAILED ***
|
|
|
|
# CHECK: $ "cat" "-b" "temp1.txt"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'cat': option -b not recognized
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: cat-error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: cat-error-1.txt' FAILED ***
|
|
|
|
# CHECK: $ "cat" "temp1.txt"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: [Errno 2] No such file or directory: 'temp1.txt'
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
2017-12-01 17:54:27 +08:00
|
|
|
|
[lit] Report line number for failed RUN command
(Relands r333584, reverted in 333592.)
When debugging test failures with -vv (or -v in the case of the
internal shell), this makes it easier to locate the RUN line that
failed. For example, clang's test/Driver/linux-ld.c has 892 total RUN
lines, and clang's test/Driver/arm-cortex-cpus.c has 424 RUN lines
after concatenation for line continuations.
When reading the generated shell script, this also makes it easier to
locate the RUN line that produced each command.
To support reporting RUN line numbers in the case of the internal
shell, this patch extends the internal shell to support the null
command, ":", except pipelines are not supported.
To support reporting RUN line numbers in the case of windows cmd.exe
as the external shell, this patch extends -vv to set "echo on" instead
of "echo off" in bat files. (Support for windows cmd.exe as a lit
external shell will likely be dropped later, but I found out too
late.)
Reviewed By: delcypher, asmith, stella.stamenova, jmorse, lebedev.ri, rnk
Differential Revision: https://reviews.llvm.org/D44598
llvm-svn: 333614
2018-05-31 08:55:32 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: colon-error.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: colon-error.txt' FAILED ***
|
|
|
|
# CHECK: $ ":"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: ':' cannot be part of a pipeline
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
2019-12-17 23:23:11 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: dev-null.txt
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-b.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-b.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "-b" "{{[^"]*}}.0" "{{[^"]*}}.1"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: 1,2
|
|
|
|
# CHECK-NEXT: {{^ }}f o o
|
|
|
|
# CHECK-NEXT: ! b a r
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: {{^ }}f o o
|
|
|
|
# CHECK-NEXT: ! bar
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
2019-10-17 01:21:24 +08:00
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-encodings.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-encodings.txt' FAILED ***
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.bin" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.utf16" "diff-in.bin"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# 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: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.utf8" "diff-in.bin"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: +++
|
|
|
|
# CHECK-NEXT: @@
|
|
|
|
# CHECK-NEXT: -foo
|
|
|
|
# CHECK-NEXT: -bar
|
|
|
|
# CHECK-NEXT: -baz
|
|
|
|
# CHECK-NEXT: {{^\+.f.o.o.$}}
|
|
|
|
# CHECK-NEXT: {{^\+.b.a.r..}}
|
|
|
|
# CHECK-NEXT: {{^\+.b.a.z.$}}
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.bin" "diff-in.utf8"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: +++
|
|
|
|
# CHECK-NEXT: @@
|
|
|
|
# CHECK-NEXT: {{^\-.f.o.o.$}}
|
|
|
|
# CHECK-NEXT: {{^\-.b.a.r..}}
|
|
|
|
# CHECK-NEXT: {{^\-.b.a.z.$}}
|
|
|
|
# CHECK-NEXT: +foo
|
|
|
|
# CHECK-NEXT: +bar
|
|
|
|
# CHECK-NEXT: +baz
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
2019-10-17 22:03:06 +08:00
|
|
|
# CHECK: $ "cat" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "diff" "-u" "-" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.bin" "-"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.utf16" "-"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# 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: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "diff-in.bin"
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "diff" "-u" "diff-in.utf8" "-"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: +++
|
|
|
|
# CHECK-NEXT: @@
|
|
|
|
# CHECK-NEXT: -foo
|
|
|
|
# CHECK-NEXT: -bar
|
|
|
|
# CHECK-NEXT: -baz
|
|
|
|
# CHECK-NEXT: {{^\+.f.o.o.$}}
|
|
|
|
# CHECK-NEXT: {{^\+.b.a.r..}}
|
|
|
|
# CHECK-NEXT: {{^\+.b.a.z.$}}
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "-" "diff-in.utf8"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: +++
|
|
|
|
# CHECK-NEXT: @@
|
|
|
|
# CHECK-NEXT: {{^\-.f.o.o.$}}
|
|
|
|
# CHECK-NEXT: {{^\-.b.a.r..}}
|
|
|
|
# CHECK-NEXT: {{^\-.b.a.z.$}}
|
|
|
|
# CHECK-NEXT: +foo
|
|
|
|
# CHECK-NEXT: +bar
|
|
|
|
# CHECK-NEXT: +baz
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
2019-10-17 01:21:24 +08:00
|
|
|
# CHECK: $ "false"
|
|
|
|
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-1.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "-B" "temp1.txt" "temp2.txt"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'diff': option -B not recognized
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: error: command failed with exit status: 1
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-2.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-2.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "temp.txt"
|
|
|
|
# CHECK: # command stderr:
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: Error: missing or extra operand
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-3.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-3.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "temp.txt" "temp1.txt"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: 'diff' command failed
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-4.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-4.txt' FAILED ***
|
|
|
|
# CHECK: Exit Code: 1
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: diff-error-4.txt.tmp
|
|
|
|
# CHECK: diff-error-4.txt.tmp1
|
|
|
|
# CHECK: *** 1 ****
|
|
|
|
# CHECK: ! hello-first
|
|
|
|
# CHECK: --- 1 ----
|
|
|
|
# CHECK: ! hello-second
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-5.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-5.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff"
|
|
|
|
# CHECK: # command stderr:
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: Error: missing or extra operand
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-error-6.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-error-6.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff"
|
|
|
|
# CHECK: # command stderr:
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: Error: missing or extra operand
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-pipes.txt
|
|
|
|
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-pipes.txt' FAILED ***
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "{{[^"]*}}.foo" "{{[^"]*}}.foo"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "FileCheck"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "{{[^"]*}}.foo" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: note: command had no output on stdout or stderr
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "FileCheck"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
2019-10-17 22:03:06 +08:00
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.foo"
|
|
|
|
# CHECK: $ "diff" "-u" "-" "{{[^"]*}}.foo"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.foo"
|
|
|
|
# CHECK: $ "diff" "-u" "{{[^"]*}}.foo" "-"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: $ "diff" "-u" "{{[^"]*}}.foo" "-"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@
|
|
|
|
# CHECK-NEXT: -foo
|
|
|
|
# CHECK-NEXT: +bar
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: $ "diff" "-u" "-" "{{[^"]*}}.foo"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@
|
|
|
|
# CHECK-NEXT: -bar
|
|
|
|
# CHECK-NEXT: +foo
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.foo"
|
|
|
|
# CHECK: $ "diff" "-" "{{[^"]*}}.foo"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "FileCheck"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
|
|
|
|
# CHECK: $ "cat" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: $ "diff" "-u" "{{[^"]*}}.foo" "-"
|
|
|
|
# CHECK: note: command had no output on stdout or stderr
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "FileCheck"
|
|
|
|
# CHECK-NOT: note
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: $ "false"
|
|
|
|
|
2019-10-12 19:56:57 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-0.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-0.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: Only in {{.*}}dir1: dir1unique
|
|
|
|
# CHECK: Only in {{.*}}dir2: dir2unique
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-1.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: *** {{.*}}dir1{{.*}}subdir{{.*}}f01
|
|
|
|
# CHECK: --- {{.*}}dir2{{.*}}subdir{{.*}}f01
|
|
|
|
# CHECK: 12345
|
|
|
|
# CHECK: 00000
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-2.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-2.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: Only in {{.*}}dir2: extrafile
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-3.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-3.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: Only in {{.*}}dir1: extra_subdir
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-4.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-4.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: File {{.*}}dir1{{.*}}extra_subdir is a directory while file {{.*}}dir2{{.*}}extra_subdir is a regular file
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-5.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-5.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: Only in {{.*}}dir1: extra_subdir
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-6.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-6.txt' FAILED ***
|
2019-02-28 18:58:13 +08:00
|
|
|
# CHECK: $ "diff" "-r"
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: File {{.*}}dir1{{.*}}extra_file is a regular empty file while file {{.*}}dir2{{.*}}extra_file is a directory
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
2019-10-17 22:03:06 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-7.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-7.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "-r" "-" "{{[^"]*}}"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: cannot recursively compare '-'
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: diff-r-error-8.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-r-error-8.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "-r" "{{[^"]*}}" "-"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: cannot recursively compare '-'
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
|
2018-01-10 02:23:34 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: diff-r.txt
|
|
|
|
|
2019-10-17 01:21:57 +08:00
|
|
|
|
|
|
|
# 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: ***
|
|
|
|
|
|
|
|
|
2019-10-15 03:59:30 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: diff-unified.txt
|
|
|
|
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-unified.txt' FAILED ***
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-u" "{{[^"]*}}.foo" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@ {{.*}} @@
|
|
|
|
# CHECK-NEXT: 3
|
|
|
|
# CHECK-NEXT: 4
|
|
|
|
# CHECK-NEXT: 5
|
|
|
|
# CHECK-NEXT: -6 foo
|
|
|
|
# CHECK-NEXT: +6 bar
|
|
|
|
# CHECK-NEXT: 7
|
|
|
|
# CHECK-NEXT: 8
|
|
|
|
# CHECK-NEXT: 9
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK-NEXT: error: command failed with exit status: 1
|
|
|
|
# CHECK-NEXT: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-U" "2" "{{[^"]*}}.foo" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@ {{.*}} @@
|
|
|
|
# CHECK-NEXT: 4
|
|
|
|
# CHECK-NEXT: 5
|
|
|
|
# CHECK-NEXT: -6 foo
|
|
|
|
# CHECK-NEXT: +6 bar
|
|
|
|
# CHECK-NEXT: 7
|
|
|
|
# CHECK-NEXT: 8
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK-NEXT: error: command failed with exit status: 1
|
|
|
|
# CHECK-NEXT: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-U4" "{{[^"]*}}.foo" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@ {{.*}} @@
|
|
|
|
# CHECK-NEXT: 2
|
|
|
|
# CHECK-NEXT: 3
|
|
|
|
# CHECK-NEXT: 4
|
|
|
|
# CHECK-NEXT: 5
|
|
|
|
# CHECK-NEXT: -6 foo
|
|
|
|
# CHECK-NEXT: +6 bar
|
|
|
|
# CHECK-NEXT: 7
|
|
|
|
# CHECK-NEXT: 8
|
|
|
|
# CHECK-NEXT: 9
|
|
|
|
# CHECK-NEXT: 10
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK-NEXT: error: command failed with exit status: 1
|
|
|
|
# CHECK-NEXT: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-U0" "{{[^"]*}}.foo" "{{[^"]*}}.bar"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: @@ {{.*}} @@
|
|
|
|
# CHECK-NEXT: -6 foo
|
|
|
|
# CHECK-NEXT: +6 bar
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK-NEXT: error: command failed with exit status: 1
|
|
|
|
# CHECK-NEXT: $ "true"
|
|
|
|
|
[lit] Make internal diff work in pipelines
When using lit's internal shell, RUN lines like the following
accidentally execute an external `diff` instead of lit's internal
`diff`:
```
# RUN: program | diff file -
# RUN: not diff file1 file2 | FileCheck %s
```
Such cases exist now, in `clang/test/Analysis` for example. We are
preparing patches to ensure lit's internal `diff` is called in such
cases, which will then fail because lit's internal `diff` cannot
currently be used in pipelines and doesn't recognize `-` as a
command-line option.
To enable pipelines, this patch moves lit's `diff` implementation into
an out-of-process script, similar to lit's `cat` implementation. A
follow-up patch will implement `-` to mean stdin.
Also, when lit's `diff` prints differences to stdout in Windows, this
patch ensures it always terminate lines with `\n` not `\r\n`. That
way, strict FileCheck directives checking the `diff` output succeed in
both Linux and Windows. This wasn't an issue when `diff` was internal
to lit because `diff` didn't then write to the true stdout, which is
where the `\n` -> `\r\n` conversion happened in Python.
Reviewed By: probinson, stella.stamenova
Differential Revision: https://reviews.llvm.org/D66574
2019-10-17 22:02:42 +08:00
|
|
|
# CHECK: $ "diff" "-U" "30.1" "{{[^"]*}}" "{{[^"]*}}"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: invalid '-U' argument: 30.1
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
|
|
|
# CHECK: $ "diff" "-U-1" "{{[^"]*}}" "{{[^"]*}}"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: invalid '-U' argument: -1
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: $ "true"
|
|
|
|
|
2019-10-15 03:59:30 +08:00
|
|
|
# CHECK: $ "false"
|
|
|
|
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
|
2019-12-17 23:23:11 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: diff-w.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: diff-w.txt' FAILED ***
|
|
|
|
# CHECK: $ "diff" "-w" "{{[^"]*}}.0" "{{[^"]*}}.1"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK: 1,3
|
|
|
|
# CHECK-NEXT: {{^ }}foo
|
|
|
|
# CHECK-NEXT: {{^ }}bar
|
|
|
|
# CHECK-NEXT: ! baz
|
|
|
|
# CHECK-NEXT: ---
|
|
|
|
# CHECK-NEXT: {{^ }}foo
|
|
|
|
# CHECK-NEXT: {{^ }}bar
|
|
|
|
# CHECK-NEXT: ! bat
|
|
|
|
# CHECK-EMPTY:
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: error-0.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: error-0.txt' FAILED ***
|
2016-06-03 07:49:42 +08:00
|
|
|
# CHECK: $ "not-a-real-command"
|
|
|
|
# CHECK: # command stderr:
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: 'not-a-real-command': command not found
|
2016-06-03 07:49:42 +08:00
|
|
|
# CHECK: error: command failed with exit status: 127
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# FIXME: The output here sucks.
|
|
|
|
#
|
|
|
|
# CHECK: FAIL: shtest-shell :: error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: error-1.txt' FAILED ***
|
2018-05-31 11:40:37 +08:00
|
|
|
# CHECK: shell parser error on: ': \'RUN: at line 3\'; echo "missing quote'
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: error-2.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: error-2.txt' FAILED ***
|
|
|
|
# CHECK: Unsupported redirect:
|
|
|
|
# CHECK: ***
|
|
|
|
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: FAIL: shtest-shell :: mkdir-error-0.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: mkdir-error-0.txt' FAILED ***
|
|
|
|
# CHECK: $ "mkdir" "-p" "temp"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'mkdir' cannot be part of a pipeline
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: mkdir-error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: mkdir-error-1.txt' FAILED ***
|
|
|
|
# CHECK: $ "mkdir" "-p" "-m" "777" "temp"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'mkdir': option -m not recognized
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: mkdir-error-2.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: mkdir-error-2.txt' FAILED ***
|
|
|
|
# CHECK: $ "mkdir" "-p"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: 'mkdir' is missing an operand
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: redirects.txt
|
2017-12-01 17:54:27 +08:00
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: rm-error-0.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: rm-error-0.txt' FAILED ***
|
|
|
|
# CHECK: $ "rm" "-rf" "temp"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'rm' cannot be part of a pipeline
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: rm-error-1.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: rm-error-1.txt' FAILED ***
|
|
|
|
# CHECK: $ "rm" "-f" "-v" "temp"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Unsupported: 'rm': option -v not recognized
|
|
|
|
# CHECK: error: command failed with exit status: 127
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: rm-error-2.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: rm-error-2.txt' FAILED ***
|
|
|
|
# CHECK: $ "rm" "-r" "hello"
|
|
|
|
# CHECK: # command stderr:
|
|
|
|
# CHECK: Error: 'rm' command failed
|
|
|
|
# CHECK: error: command failed with exit status: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: rm-error-3.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: rm-error-3.txt' FAILED ***
|
|
|
|
# CHECK: Exit Code: 1
|
|
|
|
# CHECK: ***
|
|
|
|
|
2019-03-01 03:16:17 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: rm-unicode-0.txt
|
2013-02-01 06:15:20 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: sequencing-0.txt
|
|
|
|
# CHECK: XFAIL: shtest-shell :: sequencing-1.txt
|
2019-10-19 00:53:45 +08:00
|
|
|
|
|
|
|
# CHECK: FAIL: shtest-shell :: stdout-encoding.txt
|
|
|
|
# CHECK: *** TEST 'shtest-shell :: stdout-encoding.txt' FAILED ***
|
|
|
|
# CHECK: $ "cat" "diff-in.bin"
|
|
|
|
# CHECK: # command output:
|
|
|
|
# CHECK-NEXT: {{^.f.o.o.$}}
|
|
|
|
# CHECK-NEXT: {{^.b.a.r..}}
|
|
|
|
# CHECK-NEXT: {{^.b.a.z.$}}
|
|
|
|
# CHECK-NOT: error
|
|
|
|
# CHECK: $ "false"
|
|
|
|
# CHECK: ***
|
|
|
|
|
2017-12-01 17:54:27 +08:00
|
|
|
# CHECK: PASS: shtest-shell :: valid-shell.txt
|
2019-12-17 23:23:11 +08:00
|
|
|
# CHECK: Failing Tests (35)
|