diff options
author | David Edmundson <kde@davidedmundson.co.uk> | 2018-08-08 18:36:35 +0100 |
---|---|---|
committer | David Edmundson <kde@davidedmundson.co.uk> | 2018-08-08 18:36:35 +0100 |
commit | 499edcea257637b498a64ffb80df35b4e04f6f4b (patch) | |
tree | 72d77d34895d955650fee1e9e4ba731566ad1961 | |
parent | 63037ce623a366a2af3b3b4c9af232c0b084e207 (diff) | |
download | kconfig-499edcea257637b498a64ffb80df35b4e04f6f4b.tar.gz kconfig-499edcea257637b498a64ffb80df35b4e04f6f4b.tar.bz2 |
Fix cleanup of kconfigtest kdeglobals
Summary:
We expand the path of kdeglobals to
~/.qttest/kconfigtests/../kdeglobals
which works during the test, but this cleanup is run both on startup and
after removing ~/.qttest/kconfigtests at which point the expansion
fails.
Test Plan: Ran test, looked at qttest dir. It had cleaned up
Reviewers: broulik
Reviewed By: broulik
Subscribers: kde-frameworks-devel
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D13032
-rw-r--r-- | autotests/kconfigtest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index bb3245f2..4ae6d5b8 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -94,7 +94,7 @@ static inline QString testConfigDir() { } static inline QString kdeGlobalsPath() { - return testConfigDir() + "../kdeglobals"; + return QDir::cleanPath(testConfigDir() + "..") + "/kdeglobals"; } void KConfigTest::initTestCase() |