[lit][googletest] Handle upstream gtest output
authorDaniel Dunbar <daniel@zuster.org>
Thu, 31 Mar 2016 18:22:55 +0000 (18:22 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Thu, 31 Mar 2016 18:22:55 +0000 (18:22 +0000)
commit42881eac3099b0121b7e4261a1381253d95b76ba
tree0e0ed09069efcfa58b7c650ed6fbb20a3a125ba6
parent3e4adf17625595d9425fb8109126af22475f54c0
[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
llvm/utils/lit/lit/formats/googletest.py
llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest [new file with mode: 0755]
llvm/utils/lit/tests/Inputs/googletest-upstream-format/lit.cfg [new file with mode: 0644]
llvm/utils/lit/tests/googletest-upstream-format.py [new file with mode: 0644]