diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index 07eb3b44f..1b489759c 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -888,8 +888,8 @@ def xunit(parser, xml_parent, data): :arg dict types: per framework configuration. The key should be \ one of the internal types we support:\ 'aunit', 'boosttest', 'checktype', 'cpptest', 'cppunit', 'ctest', \ - 'embunit', 'fpcunit', 'junit', 'mstest', 'nunit', 'phpunit', 'tusar', \ - 'unittest', 'valgrind'. + 'embunit', 'fpcunit', 'gtest', 'junit', 'mstest', 'nunit', 'phpunit', \ + 'tusar', 'unittest', 'valgrind'. The 'custom' type is not supported. @@ -929,6 +929,7 @@ def xunit(parser, xml_parent, data): 'ctest': 'CTestType', 'embunit': 'EmbUnitType', # since plugin v1.84 'fpcunit': 'FPCUnitJunitHudsonTestType', + 'gtest': 'GoogleTestType', 'junit': 'JUnitType', 'mstest': 'MSTestJunitHudsonTestType', 'nunit': 'NUnitJunitHudsonTestType', diff --git a/tests/publishers/fixtures/xunit001.xml b/tests/publishers/fixtures/xunit001.xml index 037da0275..735737bcf 100644 --- a/tests/publishers/fixtures/xunit001.xml +++ b/tests/publishers/fixtures/xunit001.xml @@ -17,6 +17,13 @@ <skipNoTestFiles>false</skipNoTestFiles> <stopProcessingIfError>true</stopProcessingIfError> </CppUnitJunitHudsonTestType> + <GoogleTestType> + <pattern>gtest.log</pattern> + <failIfNotNew>true</failIfNotNew> + <deleteOutputFiles>true</deleteOutputFiles> + <skipNoTestFiles>false</skipNoTestFiles> + <stopProcessingIfError>true</stopProcessingIfError> + </GoogleTestType> </types> <thresholds> <org.jenkinsci.plugins.xunit.threshold.FailedThreshold> diff --git a/tests/publishers/fixtures/xunit001.yaml b/tests/publishers/fixtures/xunit001.yaml index 7dc94eef8..7b986dc80 100644 --- a/tests/publishers/fixtures/xunit001.yaml +++ b/tests/publishers/fixtures/xunit001.yaml @@ -18,3 +18,5 @@ publishers: stoponerror: true - cppunit: pattern: "cppunit.log" + - gtest: + pattern: "gtest.log"