feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotest: Replace macro usage with HostOsInfo

Browse Source 
Change-Id: I5f9626ff13d49611b2dd000ba0311823a18b5867
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-09-10 22:58:14 +03:00
committed by Orgad Shaneh
parent 4b8564cb42
commit 37a90653f9
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/autotest/testconfiguration.cpp
View File

@@ -273,17 +273,11 @@ QString TestConfiguration::executableFilePath() const
return commandFileInfo.absoluteFilePath(); return commandFileInfo.absoluteFilePath();
} else if (commandFileInfo.path() == "."){ } else if (commandFileInfo.path() == "."){
QString fullCommandFileName = m_targetFile; QString fullCommandFileName = m_targetFile;
#ifdef Q_OS_WIN if (Utils::HostOsInfo::isWindowsHost() && !m_targetFile.endsWith(".exe"))
if (!m_targetFile.endsWith(".exe"))
fullCommandFileName = m_targetFile + QLatin1String(".exe"); fullCommandFileName = m_targetFile + QLatin1String(".exe");
static const QString separator(";");
#else
static const QString separator(":");
#endif
// TODO: check if we can use searchInPath() from Utils::Environment // TODO: check if we can use searchInPath() from Utils::Environment
const QStringList &pathList const QStringList &pathList = m_environment.toProcessEnvironment().value("PATH").split(
= m_environment.toProcessEnvironment().value("PATH").split(separator); Utils::HostOsInfo::pathListSeparator());
foreach (const QString &path, pathList) { foreach (const QString &path, pathList) {
QString filePath(path + QDir::separator() + fullCommandFileName); QString filePath(path + QDir::separator() + fullCommandFileName);