Merge pull request #7064 from dcbaker/gtest-protocol

Add support for Gtest as a test protocol

1 files changed, 6 insertions, 4 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 0cd52d1..2939b20 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -4625,8 +4625,7 @@ recommended as it is not supported on some platforms''')
 
         schema = et.XMLSchema(et.parse(str(Path(__file__).parent / 'data' / 'schema.xsd')))
 
-        testdir = os.path.join(self.common_test_dir, case)
-        self.init(testdir)
+        self.init(case)
         self.run_tests()
 
         junit = et.parse(str(Path(self.builddir) / 'meson-logs' / 'testlog.junit.xml'))
@@ -4636,10 +4635,13 @@ recommended as it is not supported on some platforms''')
             self.fail(e.error_log)
 
     def test_junit_valid_tap(self):
-        self._test_junit('213 tap tests')
+        self._test_junit(os.path.join(self.common_test_dir, '213 tap tests'))
 
     def test_junit_valid_exitcode(self):
-        self._test_junit('44 test args')
+        self._test_junit(os.path.join(self.common_test_dir, '44 test args'))
+
+    def test_junit_valid_gtest(self):
+        self._test_junit(os.path.join(self.framework_test_dir, '2 gtest'))
 
     def test_link_language_linker(self):
         # TODO: there should be some way to query how we're linking things