[Libreoffice-commits] core.git: xmlsecurity/qa

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 9 15:33:44 UTC 2018


 xmlsecurity/qa/unit/signing/signing.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9a103b6478fa2796747d6d16a4625c81d29e614f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 9 12:50:50 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Nov 9 16:31:44 2018 +0100

    Clean up excess slashes in paths
    
    Change-Id: I8e16746fc8d89adc8882303f67760341c1968aed
    Reviewed-on: https://gerrit.libreoffice.org/63190
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 675b825c9995..3b33990af540 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -173,17 +173,17 @@ void SigningTest::setUp()
 
     OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
     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 + "key3.db", aTargetDir + "key3.db");
+    osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "/cert8.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");
+    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;
     osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath);


More information about the Libreoffice-commits mailing list