[Libreoffice-commits] core.git: test/source

[Michael Stahl (via logerrit)]

 test/source/bootstrapfixture.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ecce69dc554429e42bf3fc67d75ac86cf2120714
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Jul 19 18:12:23 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Sat Jul 20 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.Stahl at cib.de>

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;