summaryrefslogtreecommitdiffstats
path: root/llvm/utils/lit
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2017-01-04 23:06:03 +0000
committerChandler Carruth <chandlerc@gmail.com>2017-01-04 23:06:03 +0000
commita977582dead2c6696ff5e273efe84a3878bb6e61 (patch)
tree819e3b0d9df8ea8814310febaa6188bc3ba23477 /llvm/utils/lit
parentdbf7ca9ce61faee8b21b53d0d414bf1e939bb881 (diff)
downloadbcm5719-llvm-a977582dead2c6696ff5e273efe84a3878bb6e61.tar.gz
bcm5719-llvm-a977582dead2c6696ff5e273efe84a3878bb6e61.zip
[gtest] Upgrade googletest to version 1.8.0, minimizing local changes.
This required re-working the streaming support and lit's support for '--gtest_list_tests' but otherwise seems to be a clean upgrade. Differential Revision: https://reviews.llvm.org/D28154 llvm-svn: 291029
Diffstat (limited to 'llvm/utils/lit')
-rw-r--r--llvm/utils/lit/lit/formats/googletest.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/utils/lit/lit/formats/googletest.py b/llvm/utils/lit/lit/formats/googletest.py
index fddb2f5f684..29a92c4e960 100644
--- a/llvm/utils/lit/lit/formats/googletest.py
+++ b/llvm/utils/lit/lit/formats/googletest.py
@@ -43,7 +43,13 @@ class GoogleTest(TestFormat):
nested_tests = []
for ln in lines:
- if not ln.strip():
+ # The test name list includes trailing comments beginning with
+ # a '#' on some lines, so skip those. We don't support test names
+ # that use escaping to embed '#' into their name as the names come
+ # from C++ class and method names where such things are hard and
+ # uninteresting to support.
+ ln = ln.split('#', 1)[0].rstrip()
+ if not ln.lstrip():
continue
if 'Running main() from gtest_main.cc' in ln:
OpenPOWER on IntegriCloud