From 8f6b2b6630a8b856a5a07ceb165a1d70cedeb9a1 Mon Sep 17 00:00:00 2001 From: Brian Gesiak Date: Wed, 26 Jul 2017 15:10:50 +0000 Subject: [PATCH] [lit] Mark several of lit's tests XFAIL on Windows 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 --- utils/lit/tests/discovery.py | 3 +++ utils/lit/tests/googletest-format.py | 3 +++ utils/lit/tests/googletest-timeout.py | 3 +++ utils/lit/tests/googletest-upstream-format.py | 3 +++ utils/lit/tests/lit.cfg | 3 +++ utils/lit/tests/max-failures.py | 3 +++ utils/lit/tests/selecting.py | 2 ++ utils/lit/tests/shtest-format.py | 3 +++ utils/lit/tests/shtest-output-printing.py | 3 +++ utils/lit/tests/shtest-shell.py | 3 +++ utils/lit/tests/shtest-timeout.py | 3 +++ utils/lit/tests/unit/TestRunner.py | 3 +++ utils/lit/tests/unittest-adaptor.py | 3 +++ 13 files changed, 38 insertions(+) diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py index 55e54088b587..ab25a0eadab7 100644 --- a/utils/lit/tests/discovery.py +++ b/utils/lit/tests/discovery.py @@ -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 diff --git a/utils/lit/tests/googletest-format.py b/utils/lit/tests/googletest-format.py index a62fd1b3ccaf..a8e96d9695a1 100644 --- a/utils/lit/tests/googletest-format.py +++ b/utils/lit/tests/googletest-format.py @@ -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 # diff --git a/utils/lit/tests/googletest-timeout.py b/utils/lit/tests/googletest-timeout.py index 46acf32b3a61..7d5721ea3d1c 100644 --- a/utils/lit/tests/googletest-timeout.py +++ b/utils/lit/tests/googletest-timeout.py @@ -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 diff --git a/utils/lit/tests/googletest-upstream-format.py b/utils/lit/tests/googletest-upstream-format.py index 1fc7c7c4a5ad..425b528aaeb0 100644 --- a/utils/lit/tests/googletest-upstream-format.py +++ b/utils/lit/tests/googletest-upstream-format.py @@ -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 # diff --git a/utils/lit/tests/lit.cfg b/utils/lit/tests/lit.cfg index 4b38241d5a7d..ed1c6c68d0c3 100644 --- a/utils/lit/tests/lit.cfg +++ b/utils/lit/tests/lit.cfg @@ -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') diff --git a/utils/lit/tests/max-failures.py b/utils/lit/tests/max-failures.py index 5cc258dd08aa..7a26b3cd038b 100644 --- a/utils/lit/tests/max-failures.py +++ b/utils/lit/tests/max-failures.py @@ -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 diff --git a/utils/lit/tests/selecting.py b/utils/lit/tests/selecting.py index 19ba240f9b0f..fd6cd9016c0e 100644 --- a/utils/lit/tests/selecting.py +++ b/utils/lit/tests/selecting.py @@ -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 # diff --git a/utils/lit/tests/shtest-format.py b/utils/lit/tests/shtest-format.py index 37e3e1c12629..8e69573e9ff1 100644 --- a/utils/lit/tests/shtest-format.py +++ b/utils/lit/tests/shtest-format.py @@ -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 # diff --git a/utils/lit/tests/shtest-output-printing.py b/utils/lit/tests/shtest-output-printing.py index 24580b37f1f5..a8a99e3c1957 100644 --- a/utils/lit/tests/shtest-output-printing.py +++ b/utils/lit/tests/shtest-output-printing.py @@ -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 # diff --git a/utils/lit/tests/shtest-shell.py b/utils/lit/tests/shtest-shell.py index 18b80cd7d087..1a6d91eee220 100644 --- a/utils/lit/tests/shtest-shell.py +++ b/utils/lit/tests/shtest-shell.py @@ -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 # diff --git a/utils/lit/tests/shtest-timeout.py b/utils/lit/tests/shtest-timeout.py index 87f431de2500..879850065908 100644 --- a/utils/lit/tests/shtest-timeout.py +++ b/utils/lit/tests/shtest-timeout.py @@ -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 \ diff --git a/utils/lit/tests/unit/TestRunner.py b/utils/lit/tests/unit/TestRunner.py index 79cc10f7e14d..580f31d69c1c 100644 --- a/utils/lit/tests/unit/TestRunner.py +++ b/utils/lit/tests/unit/TestRunner.py @@ -1,5 +1,8 @@ # RUN: %{python} %s # +# PR33942 +# XFAIL: windows +# # END. diff --git a/utils/lit/tests/unittest-adaptor.py b/utils/lit/tests/unittest-adaptor.py index 0848cd22baae..10dd567a9a83 100644 --- a/utils/lit/tests/unittest-adaptor.py +++ b/utils/lit/tests/unittest-adaptor.py @@ -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 #