summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2015-04-07 18:14:10 +0000
committerReid Kleckner <reid@kleckner.net>2015-04-07 18:14:10 +0000
commit285ec33f6929ae7b8dacaace2099b310d12128aa (patch)
tree036dafee7ac5b1b9c13512de306fd8e6f6439815
parent47a6d12ba71e1aad492cf76feed5b256c9132e58 (diff)
[lit] Allow disabling an entire gtest suite, as is done in tsan
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234336 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--utils/lit/lit/formats/googletest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/lit/lit/formats/googletest.py b/utils/lit/lit/formats/googletest.py
index a1ecced52a8..3ce57917113 100644
--- a/utils/lit/lit/formats/googletest.py
+++ b/utils/lit/lit/formats/googletest.py
@@ -53,7 +53,8 @@ class GoogleTest(TestFormat):
ln = ln[index*2:]
if ln.endswith('.'):
nested_tests.append(ln)
- elif ln.startswith('DISABLED_'):
+ elif any([name.startswith('DISABLED_')
+ for name in nested_tests + [ln]]):
# Gtest will internally skip these tests. No need to launch a
# child process for it.
continue