diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 09:10:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 08:40:05 +0000 |
| commit | 6d40c515fdf86d807c199ff4179b9c862a9fe5b2 (patch) | |
| tree | 53edc46fc7fa083a77a8f714be08aca8aae73eae /xmlsecurity/qa | |
| parent | 010a2a8ed3214380d514be56171c974f99010bc1 (diff) | |
libxmlsec: drop xmlsec1-keyinfo-revert.patch.1 completely
And instead attempt to set up the test environment correctly.
Change-Id: I06c10b96749c0464da8d2dd9a59b48f16baeead5
Reviewed-on: https://gerrit.libreoffice.org/27785
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/qa')
| -rw-r--r-- | xmlsecurity/qa/unit/signing/data/cert8.db | bin | 0 -> 65536 bytes | |||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xmlsecurity/qa/unit/signing/data/cert8.db b/xmlsecurity/qa/unit/signing/data/cert8.db Binary files differnew file mode 100644 index 000000000000..8354fd309e3a --- /dev/null +++ b/xmlsecurity/qa/unit/signing/data/cert8.db diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 7065d0d53e6c..adf2a7b677b0 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -110,6 +110,16 @@ void SigningTest::setUp() mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); + +#ifndef _WIN32 + // Set up cert8.db in workdir/CppunitTest/ + OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY); + OUString aTargetDir = m_directories.getURLFromWorkdir("/CppunitTest/"); + osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "cert8.db"); + OUString aTargetPath; + osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath); + setenv("MOZILLA_CERTIFICATE_FOLDER", aTargetPath.toUtf8().getStr(), 1); +#endif } void SigningTest::tearDown() |