[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kio] src/ioslaves/trash/tests: Try to fix CI for testtrash, it's launching klauncher erroneously
From: David Faure <faure () kde ! org>
Date: 2014-10-31 22:45:04
Message-ID: E1XkKwK-0004MO-HD () scm ! kde ! org
[Download RAW message or body]
Git commit 89920462723dd3b91607953e6641936b0a7253d7 by David Faure.
Committed on 31/10/2014 at 22:44.
Pushed by dfaure into branch 'master'.
Try to fix CI for testtrash, it's launching klauncher erroneously
Change-Id: Ib68bfd71a1e0edccd21e9367824f16ce4dc57a54
M +3 -3 src/ioslaves/trash/tests/testtrash.cpp
http://commits.kde.org/kio/89920462723dd3b91607953e6641936b0a7253d7
diff --git a/src/ioslaves/trash/tests/testtrash.cpp \
b/src/ioslaves/trash/tests/testtrash.cpp index 39e1118..e59b31a 100644
--- a/src/ioslaves/trash/tests/testtrash.cpp
+++ b/src/ioslaves/trash/tests/testtrash.cpp
@@ -133,8 +133,8 @@ static void removeDirRecursive(const QString &dir)
void TestTrash::initTestCase()
{
- qDebug() << qgetenv("LC_ALL");
- setenv("KDE_FORK_SLAVES", "yes", true);
+ // To avoid a runtime dependency on klauncher
+ qputenv("KDE_FORK_SLAVES", "yes");
m_trashDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) \
+ QString::fromLatin1("/Trash"); qDebug() << "setup: using trash directory " << \
m_trashDir; @@ -836,7 +836,7 @@ void TestTrash::copyDirectoryFromTrash()
QVERIFY(QFile::exists(destPath + "/subdir/subfile"));
}
-void TestTrash::copySymlinkFromTrash()
+void TestTrash::copySymlinkFromTrash() // relies on trashSymlinkFromHome() being \
called first {
const QString destPath = otherTmpDir() + \
QString::fromLatin1("symlinkFromHome_copied"); \
copyFromTrash(QString::fromLatin1("symlinkFromHome"), destPath);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic