summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2015-01-07 15:14:04 +0100
committerChristian Stenger <christian.stenger@theqtcompany.com>2015-01-07 15:21:18 +0100
commit91fabc486883be28cdec57b1fbf582e022ede0f8 (patch)
tree3a12c01608e711dba2219e4294e8292d0feeed84 /src
parent89ca18e4d71b87551e3bb9572d49aa098bde1f55 (diff)
downloadqt-creator-91fabc486883be28cdec57b1fbf582e022ede0f8.tar.gz
CppTools: Fix hanging test on OSX
Temporary directory is created in a folder having a symbolic link, verification was done with the unresolved path and failed. Change-Id: I40c943a307fe136a0f3f6fdbea5145296a63a19e Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cpptools/cpptoolstestcase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 8ee8aa6304..4c3fbb9679 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -268,7 +268,8 @@ void ProjectOpenerAndCloser::onGcFinished()
}
TemporaryDir::TemporaryDir()
- : m_temporaryDir(QDir::tempPath() + QLatin1String("/qtcreator-tests-XXXXXX"))
+ : m_temporaryDir(QFileInfo(QDir::tempPath()).canonicalFilePath()
+ + QLatin1String("/qtcreator-tests-XXXXXX"))
, m_isValid(m_temporaryDir.isValid())
{
}