[PATCH] D102694: [lit][gtest] Support SKIPPED tests
Igor Kudrin via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue May 18 08:27:23 PDT 2021
ikudrin created this revision.
ikudrin added reviewers: bkramer, lhames, hans, thakis.
ikudrin added projects: LLVM, llvm-commits-test.
Herald added a subscriber: delcypher.
ikudrin requested review of this revision.
This updates the googletest format to support tests that use GTEST_SKIP(), which is now available with the updated googletest framework.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D102694
Files:
llvm/utils/lit/lit/formats/googletest.py
llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
llvm/utils/lit/tests/googletest-format.py
Index: llvm/utils/lit/tests/googletest-format.py
===================================================================
--- llvm/utils/lit/tests/googletest-format.py
+++ llvm/utils/lit/tests/googletest-format.py
@@ -18,9 +18,10 @@
# CHECK-NEXT: I am subTest B, I FAIL
# CHECK-NEXT: And I have two lines of output
# CHECK: ***
+# CHECK: SKIPPED: googletest-format :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/FirstTest.subTestC
# CHECK: PASS: googletest-format :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/ParameterizedTest/0.subTest
# CHECK: PASS: googletest-format :: {{[Dd]ummy[Ss]ub[Dd]ir}}/OneTest.py/ParameterizedTest/1.subTest
# CHECK: Failed Tests (1)
-# CHECK: Passed: 3
-# CHECK: Failed: 1
-
+# CHECK: Skipped: 1
+# CHECK: Passed : 3
+# CHECK: Failed : 1
Index: llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
===================================================================
--- llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+++ llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
@@ -10,6 +10,7 @@
FirstTest.
subTestA
subTestB
+ subTestC
ParameterizedTest/0.
subTest
ParameterizedTest/1.
@@ -27,6 +28,12 @@
print('I am subTest B, I FAIL')
print('And I have two lines of output')
sys.exit(1)
+elif test_name == 'FirstTest.subTestC':
+ print('I am subTest C, I am SKIPPED')
+ print('[ PASSED ] 0 tests.')
+ print('[ SKIPPED ] 1 test, listed below:')
+ print('[ SKIPPED ] FirstTest.subTestC')
+ sys.exit(0)
elif test_name in ('ParameterizedTest/0.subTest',
'ParameterizedTest/1.subTest'):
print('I am a parameterized test, I also PASS')
Index: llvm/utils/lit/lit/formats/googletest.py
===================================================================
--- llvm/utils/lit/lit/formats/googletest.py
+++ llvm/utils/lit/lit/formats/googletest.py
@@ -135,6 +135,9 @@
if exitCode:
return lit.Test.FAIL, out + err
+ if '[ SKIPPED ] 1 test,' in out:
+ return lit.Test.SKIPPED, ''
+
passing_test_line = '[ PASSED ] 1 test.'
if passing_test_line not in out:
msg = ('Unable to find %r in gtest output:\n\n%s%s' %
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D102694.346182.patch
Type: text/x-patch
Size: 2214 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210518/dae9c57b/attachment.bin>
More information about the llvm-commits
mailing list