Skip to content

Commit

Permalink
[lit] Mark several of lit's tests XFAIL on Windows
Browse files Browse the repository at this point in the history
Summary:
rL257221 attempted to run lit's own test suite continuously, but that
commit was reverted because lit's test suite does not pass on Windows.
Because lit's tests do not run continuously, they often regress.

In order to un-revert rL257221, mark lit tests that fail as XFAIL for
Windows platforms.

Test Plan:
On a Windows development environment, follow the instructions in
utils/lit/README.txt to run lit's test suite:

```
utils/lit/lit.py \
    --path /path/to/your/llvm/build/bin \
    utils/lit/tests
```

Verify that the test suite is run and a successful exit code is
returned.

Reviewers: mgorny, rnk, delcypher, beanz

Reviewed By: rnk

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D35879

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309123 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
modocache committed Jul 26, 2017
1 parent 1cb9d8c commit 8f6b2b6
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 0 deletions.
3 changes: 3 additions & 0 deletions utils/lit/tests/discovery.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the basic discovery process, including a sub-suite.
#
# PR33932
# XFAIL: windows
#
# RUN: %{lit} %{inputs}/discovery \
# RUN: -j 1 --debug --show-tests --show-suites \
# RUN: -v > %t.out 2> %t.err
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/googletest-format.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the various features of the GoogleTest format.
#
# PR33933
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/googletest-format > %t.out
# RUN: FileCheck < %t.out %s
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/googletest-timeout.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# REQUIRES: python-psutil

# PR33934
# XFAIL: windows

# Check that the per test timeout is enforced when running GTest tests.
#
# RUN: not %{lit} -j 1 -v %{inputs}/googletest-timeout --timeout=1 > %t.cmd.out
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/googletest-upstream-format.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the various features of the GoogleTest format.
#
# PR33935
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/googletest-upstream-format > %t.out
# RUN: FileCheck < %t.out %s
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ try:
except ImportError:
lit_config.warning('Could not import psutil. Some tests will be skipped and'
' the --timeout command line argument will not work.')

if sys.platform.startswith('win') or sys.platform.startswith('cygwin'):
config.available_features.add('windows')
3 changes: 3 additions & 0 deletions utils/lit/tests/max-failures.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the behavior of --max-failures option.
#
# PR33941
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out
# RUN: not %{lit} --max-failures=1 -j 1 -v %{inputs}/shtest-shell >> %t.out
# RUN: not %{lit} --max-failures=2 -j 1 -v %{inputs}/shtest-shell >> %t.out
Expand Down
2 changes: 2 additions & 0 deletions utils/lit/tests/selecting.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# RUN: %{lit} %{inputs}/discovery | FileCheck --check-prefix=CHECK-BASIC %s
# CHECK-BASIC: Testing: 5 tests

# PR33937
# XFAIL: windows

# Check that regex-filtering works
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/shtest-format.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the various features of the ShTest format.
#
# PR33939
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-format > %t.out
# RUN: FileCheck < %t.out %s
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/shtest-output-printing.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the various features of the ShTest format.
#
# PR33938
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-output-printing > %t.out
# RUN: FileCheck --input-file %t.out %s
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/shtest-shell.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the internal shell handling component of the ShTest format.
#
# PR33940
# XFAIL: windows
#
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out
# RUN: FileCheck --input-file %t.out %s
#
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/shtest-timeout.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# REQUIRES: python-psutil

# PR33944
# XFAIL: windows

# Test per test timeout using external shell
# RUN: not %{lit} \
# RUN: %{inputs}/shtest-timeout/infinite_loop.py \
Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/unit/TestRunner.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# RUN: %{python} %s
#
# PR33942
# XFAIL: windows
#
# END.


Expand Down
3 changes: 3 additions & 0 deletions utils/lit/tests/unittest-adaptor.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Check the lit adaption to run under unittest.
#
# PR33943
# XFAIL: windows
#
# RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err
# RUN: FileCheck < %t.err %s
#
Expand Down

0 comments on commit 8f6b2b6

Please sign in to comment.