diff options
| author | Reid Kleckner <rnk@google.com> | 2017-07-28 01:05:55 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-07-28 01:05:55 +0000 |
| commit | 4ca8d21ef371fc7caacd32fbd6af81dfea3f23c9 (patch) | |
| tree | 7b2d8595cb0c0f676a0bfd75422ef30681a74dab /llvm/utils/lit/tests/googletest-timeout.py | |
| parent | e70a472bad63666ce16a68947352806d07294015 (diff) | |
| download | bcm5719-llvm-4ca8d21ef371fc7caacd32fbd6af81dfea3f23c9.tar.gz bcm5719-llvm-4ca8d21ef371fc7caacd32fbd6af81dfea3f23c9.zip | |
[lit] Port googletest lit tests to Windows
Summary:
The technique of directly calling subprocess.Popen on a python script
doesn't work on Windows. The executable path of the command must refer
to a valid win32 executable.
Instead, rename all the python scripts masquerading as gtest executables
to have .py extensions, so we can easily detect then and call the python
executable for them. Do this on Linux as well as Windows for
consistency.
The test suite directory names also come out in lower-case on Windows.
We can consider removing that in a later patch. This change just updates
the FileCheck lines to match on Windows.
Fixes PR33933
Reviewers: modocache, mgorny
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D35909
llvm-svn: 309347
Diffstat (limited to 'llvm/utils/lit/tests/googletest-timeout.py')
| -rw-r--r-- | llvm/utils/lit/tests/googletest-timeout.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/llvm/utils/lit/tests/googletest-timeout.py b/llvm/utils/lit/tests/googletest-timeout.py index 7d5721ea3d1..8b7d10fc1f0 100644 --- a/llvm/utils/lit/tests/googletest-timeout.py +++ b/llvm/utils/lit/tests/googletest-timeout.py @@ -1,8 +1,5 @@ # 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 @@ -16,9 +13,9 @@ # RUN: FileCheck < %t.cfgset.out %s # CHECK: -- Testing: -# CHECK: PASS: googletest-timeout :: DummySubDir/OneTest/FirstTest.subTestA -# CHECK: TIMEOUT: googletest-timeout :: DummySubDir/OneTest/FirstTest.subTestB -# CHECK: TIMEOUT: googletest-timeout :: DummySubDir/OneTest/FirstTest.subTestC +# CHECK: PASS: googletest-timeout :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/FirstTest.subTestA +# CHECK: TIMEOUT: googletest-timeout :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/FirstTest.subTestB +# CHECK: TIMEOUT: googletest-timeout :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/FirstTest.subTestC # CHECK: Expected Passes : 1 # CHECK: Individual Timeouts: 2 |
