mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlsecurity: move GNUPGHOME to $workdir for unit test

Browse Source 
Since some GnuPG versions tend to litter the source tree with random
files otherwise.

Change-Id: I0302f73b216f2de4dafcb6adca81097ec9d87e8c
Reviewed-on: https://gerrit.libreoffice.org/46447
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens
2017-12-14 13:50:14 +01:00
parent f894386a8f
commit 2816ac4ad0
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xmlsecurity/qa/unit/signing/signing.cxx
View File

@@ -163,26 +163,27 @@ void SigningTest::setUp()
mxSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext); mxSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
mxSecurityContext = mxSEInitializer->createSecurityContext(OUString()); mxSecurityContext = mxSEInitializer->createSecurityContext(OUString());
#ifndef _WIN32
// Set up cert8.db in workdir/CppunitTest/
OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY); OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
OUString aTargetDir = m_directories.getURLFromWorkdir( OUString aTargetDir = m_directories.getURLFromWorkdir(
"/CppunitTest/xmlsecurity_signing.test.user/"); "/CppunitTest/xmlsecurity_signing.test.user/");
// Set up cert8.db in workdir/CppunitTest/
osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "cert8.db"); osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "cert8.db");
osl::File::copy(aSourceDir + "key3.db", aTargetDir + "key3.db"); osl::File::copy(aSourceDir + "key3.db", aTargetDir + "key3.db");
// Make gpg use our own defined setup & keys
osl::File::copy(aSourceDir + "pubring.gpg", aTargetDir + "pubring.gpg");
osl::File::copy(aSourceDir + "random_seed", aTargetDir + "random_seed");
osl::File::copy(aSourceDir + "secring.gpg", aTargetDir + "secring.gpg");
osl::File::copy(aSourceDir + "trustdb.gpg", aTargetDir + "trustdb.gpg");
OUString aTargetPath; OUString aTargetPath;
osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath); osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath);
setenv("MOZILLA_CERTIFICATE_FOLDER", aTargetPath.toUtf8().getStr(), 1);
#endif OUString mozCertVar("MOZILLA_CERTIFICATE_FOLDER");
#if HAVE_FEATURE_GPGVERIFY osl_setEnvironment(mozCertVar.pData, aTargetPath.pData);
// Make gpg use our own defined setup below data dir OUString gpgHomeVar("GNUPGHOME");
OUString aHomePath; osl_setEnvironment(gpgHomeVar.pData, aTargetPath.pData);
osl::FileBase::getSystemPathFromFileURL(
m_directories.getURLFromSrc(DATA_DIRECTORY),
aHomePath);
OUString envVar("GNUPGHOME");
osl_setEnvironment(envVar.pData, aHomePath.pData);
#endif
} }
void SigningTest::tearDown() void SigningTest::tearDown()