test/source/bootstrapfixture.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 53ca96a5e0a77cd077f9b5690302d10faf8c5247 Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Fri Jul 19 18:12:23 2019 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Jul 22 16:50:37 2019 +0200 test: check validator exit code *after* checking validator output ODF validator may now actually exit with non-0 since commit b14e2f6c63c18894286c99ee8dde9070e24b41c2 - look for validation errors in this case too. Change-Id: I36f4437c54d9a60afee0663a0b9be206773c5378 Reviewed-on: https://gerrit.libreoffice.org/75964 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> (cherry picked from commit ecce69dc554429e42bf3fc67d75ac86cf2120714) Reviewed-on: https://gerrit.libreoffice.org/76083 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index e3ee687374c5..6e06d352dec1 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -194,9 +194,6 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor OUString aCommand = aValidator + " " + rPath + " > " + aOutputFile; int returnValue = system(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8).getStr()); - CPPUNIT_ASSERT_EQUAL_MESSAGE( - OUStringToOString("failed to execute: " + aCommand, - RTL_TEXTENCODING_UTF8).getStr(), 0, returnValue); OString aContentString = loadFile(aOutput.GetURL()); OUString aContentOUString = OStringToOUString(aContentString, RTL_TEXTENCODING_UTF8); @@ -231,6 +228,9 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor CPPUNIT_FAIL(aContentString.getStr()); } } + CPPUNIT_ASSERT_EQUAL_MESSAGE( + OUStringToOString("failed to execute: " + aCommand + "\n" + aContentOUString, + RTL_TEXTENCODING_UTF8).getStr(), 0, returnValue); #else (void)rPath; (void)eFormat; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits