[lit] Fix compatibility with upstream gtest

[lzaoral]

Summary

Upstream gtest now prints 'Running main() from FILE' instead of
plain 'Running main() from gtest_main.cc'. Thus, all such tests
ended-up being mistakenly marked as UNRESOLVED.

[lzaoral]

Ping.

[davezarzycki]

LGTM but I don't feel authoritative for the lit code.

[delcypher]

llvm/utils/lit/lit/formats/googletest.py

62

This should probably be a regex that can handle both the old and new output. We can't assume the version of GTest being used because lit is used outside of LLVM in other places. Given that the cost of support of both is relatively low here, we should probably just do it.

llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py

10–11

I'd prefer if you used f-strings here rather than string interpolation operator, i.e.

    print(f"""\
Running main() from {os.getcwd()}/gtest_main.cc
...

[lzaoral]

Fix comments by @delcypher.

[lzaoral]

Ping.

[lzaoral]

Ping.

[lzaoral]

Ping.

[delcypher]

LGTM. Thanks for pinging.

[lzaoral]

Thanks a lot @delcypher! Can you (or anyone else with commit rights) commit it to trunk for me?

[mscuttari]

Ping. I've got the same problem and I would like this fix to become effective.

[probinson]

In D100043#3188388, @lzaoral wrote:

Thanks a lot @delcypher! Can you (or anyone else with commit rights) commit it to trunk for me?

@lzaoral do you have a github account so we can attribute this to you?

[lzaoral]

Yes, @probinson. login: lzaoral mail: lzaoral[at]redhat.com Thanks!

llvm/utils/lit/lit/formats/googletest.py

 from __future__ import absolute_import
 import os
+import re
 import shlex
 import subprocess
 import sys
 
 import lit.Test
 import lit.TestRunner
 import lit.util
 from .base import TestFormat
def getGTestTests(self, path, litConfig, localConfig):
             # instance, we could have created a broken executable.
             # Alternatively, someone has cruft in their test
             # directory.  If we don't return a test here, then no
             # failures will get reported, so return a dummy test name
             # so that the failure is reported later.
             yield 'failed_to_discover_tests_from_gtest'
             return
 
+        upstream_prefix = re.compile('Running main\(\) from .*gtest_main\.cc')
         nested_tests = []
         for ln in output.splitlines(False):  # Don't keep newlines.
             ln = lit.util.to_string(ln)
 
-            if 'Running main() from gtest_main.cc' in ln:
+            if upstream_prefix.fullmatch(ln):
                 # Upstream googletest prints this to stdout prior to running
                 # tests. LLVM removed that print statement in r61540, but we
                 # handle it here in case upstream googletest is being used.
                 continue
 
             # 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

llvm/utils/lit/tests/Inputs/googletest-upstream-format/DummySubDir/OneTest.py

 #!/usr/bin/env python
 
+import os
 import sys
 
 if len(sys.argv) != 2:
     raise ValueError("unexpected number of args")
 
 if sys.argv[1] == "--gtest_list_tests":
-    print("""\
-Running main() from gtest_main.cc
+    print(f"""\
+Running main() from {os.getcwd()}/gtest_main.cc
 FirstTest.
   subTestA
   subTestB
   subTestC
   subTestD
 ParameterizedTest/0.
   subTest
 ParameterizedTest/1.