diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-24 17:15:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-25 07:02:29 +0000 |
| commit | c758ad4a8be7e35c9fba29fffc5cd0ef55d68ff4 (patch) | |
| tree | 18f7117467de2005b717fd8597641cbd3065302f /xmlsecurity/qa | |
| parent | Rename ClearFormulaContext() to make it more representative. (diff) | |
| download | core-c758ad4a8be7e35c9fba29fffc5cd0ef55d68ff4.tar.gz core-c758ad4a8be7e35c9fba29fffc5cd0ef55d68ff4.zip | |
CppunitTest_xmlsecurity_pdfsigning: fix this on RHEL6
The pdfdocument problem is present only on 32bit.
The pdfsigning problem is present on RHEL6, but not on RHEL7, for some
reason NSS fails to parse the provided profile (generated by a bit newer
NSS). Just return early in that case, we want to test the PDF code
there, not NSS.
Change-Id: I1123865d4b2176676a8fdaf648222fda8ca0b923
Reviewed-on: https://gerrit.libreoffice.org/30229
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity/qa')
| -rw-r--r-- | xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx index 91a72b1218fd..a82f54581d29 100644 --- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx @@ -84,7 +84,11 @@ void PDFSigningTest::testPDFAdd() { uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment = xSecurityContext->getSecurityEnvironment(); uno::Sequence<uno::Reference<security::XCertificate>> aCertificates = xSecurityEnvironment->getPersonalCertificates(); - CPPUNIT_ASSERT(aCertificates.hasElements()); + if (!aCertificates.hasElements()) + { + // NSS failed to parse it's own profile. + return; + } CPPUNIT_ASSERT(aDocument.Sign(aCertificates[0], "test")); SvFileStream aOutStream(aOutURL, StreamMode::WRITE | StreamMode::TRUNC); CPPUNIT_ASSERT(aDocument.Write(aOutStream)); |