diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2016-03-31 18:22:55 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2016-03-31 18:22:55 +0000 |
| commit | 42881eac3099b0121b7e4261a1381253d95b76ba (patch) | |
| tree | 0e0ed09069efcfa58b7c650ed6fbb20a3a125ba6 /llvm/utils/lit/tests/googletest-upstream-format.py | |
| parent | 3e4adf17625595d9425fb8109126af22475f54c0 (diff) | |
| download | bcm5719-llvm-42881eac3099b0121b7e4261a1381253d95b76ba.tar.gz bcm5719-llvm-42881eac3099b0121b7e4261a1381253d95b76ba.zip | |
[lit][googletest] Handle upstream gtest output
Summary:
Upstream googletest prints "Running main() from gtest_main.cc" to stdout prior
to running tests. LLVM removed that print statement in r61540. If a user were
to use lit to run tests that use upstream googletest, however, lit
reports "Running main()" as an invalid test name.
To avoid such a failure, add an extra conditional to `formats/googletest.py`.
Also add tests to demonstrate the modified behavior.
Reviewers: abdulras, ddunbar
Subscribers: ddunbar, llvm-commits, kastiglione
Differential Revision: http://reviews.llvm.org/D18606
llvm-svn: 265034
Diffstat (limited to 'llvm/utils/lit/tests/googletest-upstream-format.py')
| -rw-r--r-- | llvm/utils/lit/tests/googletest-upstream-format.py | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/llvm/utils/lit/tests/googletest-upstream-format.py b/llvm/utils/lit/tests/googletest-upstream-format.py new file mode 100644 index 00000000000..1fc7c7c4a5a --- /dev/null +++ b/llvm/utils/lit/tests/googletest-upstream-format.py @@ -0,0 +1,20 @@ +# Check the various features of the GoogleTest format. +# +# RUN: not %{lit} -j 1 -v %{inputs}/googletest-upstream-format > %t.out +# RUN: FileCheck < %t.out %s +# +# END. + +# CHECK: -- Testing: +# CHECK: PASS: googletest-upstream-format :: DummySubDir/OneTest/FirstTest.subTestA +# CHECK: FAIL: googletest-upstream-format :: DummySubDir/OneTest/FirstTest.subTestB +# CHECK-NEXT: *** TEST 'googletest-upstream-format :: DummySubDir/OneTest/FirstTest.subTestB' FAILED *** +# CHECK-NEXT: Running main() from gtest_main.cc +# CHECK-NEXT: I am subTest B, I FAIL +# CHECK-NEXT: And I have two lines of output +# CHECK: *** +# CHECK: PASS: googletest-upstream-format :: DummySubDir/OneTest/ParameterizedTest/0.subTest +# CHECK: PASS: googletest-upstream-format :: DummySubDir/OneTest/ParameterizedTest/1.subTest +# CHECK: Failing Tests (1) +# CHECK: Expected Passes : 3 +# CHECK: Unexpected Failures: 1 |
