diff options
| author | Roman Lebedev <lebedev.ri@gmail.com> | 2021-03-22 14:44:30 +0300 |
|---|---|---|
| committer | Roman Lebedev <lebedev.ri@gmail.com> | 2021-03-22 15:25:32 +0300 |
| commit | ef4b3a4571e26763fca1fdd3aa6f902806111866 (patch) | |
| tree | 827c7b346d083e3aa013643e3a64a0a9f090a967 /llvm/utils/lit/tests/shtest-shell.py | |
| parent | aae10a94ff12d1766e7d5a3ef743ae5fd7b0b60d (diff) | |
| download | llvm-ef4b3a4571e26763fca1fdd3aa6f902806111866.zip llvm-ef4b3a4571e26763fca1fdd3aa6f902806111866.tar.gz llvm-ef4b3a4571e26763fca1fdd3aa6f902806111866.tar.bz2 | |
[NFCI][lit] Unbreak more lit self-tests after D98179
All of these depend on the order of tests, so if one runs them twice,
the tests within them will naturally be reordered
using the previous run times, which breaks them.
Diffstat (limited to 'llvm/utils/lit/tests/shtest-shell.py')
| -rw-r--r-- | llvm/utils/lit/tests/shtest-shell.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index 3f1ead3..13cf05f 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -1,5 +1,8 @@ # Check the internal shell handling component of the ShTest format. -# + +# FIXME: this test depends on order of tests +# RUN: rm -f %{inputs}/shtest-shell/.lit_test_times.txt + # RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out # FIXME: Temporarily dump test output so we can debug failing tests on # buildbots. @@ -290,7 +293,7 @@ # CHECK: FAIL: shtest-shell :: diff-r-error-0.txt # CHECK: *** TEST 'shtest-shell :: diff-r-error-0.txt' FAILED *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # CHECK: # command output: # CHECK: Only in {{.*}}dir1: dir1unique # CHECK: Only in {{.*}}dir2: dir2unique @@ -298,7 +301,7 @@ # CHECK: FAIL: shtest-shell :: diff-r-error-1.txt # CHECK: *** TEST 'shtest-shell :: diff-r-error-1.txt' FAILED *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # CHECK: # command output: # CHECK: *** {{.*}}dir1{{.*}}subdir{{.*}}f01 # CHECK: --- {{.*}}dir2{{.*}}subdir{{.*}}f01 @@ -308,35 +311,35 @@ # CHECK: FAIL: shtest-shell :: diff-r-error-2.txt # CHECK: *** TEST 'shtest-shell :: diff-r-error-2.txt' FAILED *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # 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 *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # 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 *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # 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 *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # 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 *** -# CHECK: $ "diff" "-r" +# CHECK: $ "diff" "-r" # 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 |