From dc884734a77673d86bb95287d79f65ce6bedaa2b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 22 Aug 2016 15:09:50 +0200 Subject: Make CppunitTest_xmlsecurity_signing more reliable ...by placing cert8.db (and automatically created key3.db, secmod.db) in workdir/CppunitTest/xmlsecurity_signing.test.user/, which gets recreated afresh on every test run. (From solenv/gbuild/CppunitTest.mk, that path should be available in the test as the value of the UserInstallation bootstrap var, but then test::BootstrapFixtureBase::setUp in unotest/source/cpp/bootstrapfixturebase.cxx explicitly resets UserInstallation to someplace else.) Change-Id: Iebd2956134ec2226b28024e7c26e02b642a1e6b1 --- xmlsecurity/qa/unit/signing/signing.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xmlsecurity/qa') diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index adf2a7b677b0..37bf9bece72d 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -114,7 +114,8 @@ void SigningTest::setUp() #ifndef _WIN32 // Set up cert8.db in workdir/CppunitTest/ OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY); - OUString aTargetDir = m_directories.getURLFromWorkdir("/CppunitTest/"); + OUString aTargetDir = m_directories.getURLFromWorkdir( + "/CppunitTest/xmlsecurity_signing.test.user/"); osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "cert8.db"); OUString aTargetPath; osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath); -- cgit v1.2.3