diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-19 18:12:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-22 16:50:16 +0200 |
| commit | 2e35ce9f93bcb7bc3678df65b62ceef15a3d4cae (patch) | |
| tree | a2726cbb6c1a588ecbbec74e9a666e0435bd4466 /test | |
| parent | 8d4733df5ca12e92dbf5d5ac525fd4d8bf9307dd (diff) | |
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@cib.de>
(cherry picked from commit ecce69dc554429e42bf3fc67d75ac86cf2120714)
Reviewed-on: https://gerrit.libreoffice.org/76084
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; |