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

AutoTest: Fix setting working directory

Browse Source 
If there is no working directory explicitly set inside the run
configuration we end up using the current working directory of
Qt Creator.
We normally get an empty string if not having modified the respective
target ourselves although you can see a default working directory when
opening the respective target for the first time.

Task-number: QTCREATORBUG-16715
Change-Id: I6e16fd4f9b15759793653a6c229c44a1be2b7739
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2016-08-05 15:02:37 +02:00
parent 1a755521ff
commit cbd4f80279
3 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/autotest/testrunner.cpp
View File

@@ -55,35 +55,6 @@ namespace Internal {
static TestRunner *m_instance = 0;
static QString executableFilePath(const QString &command, const QProcessEnvironment &environment)
{
if (command.isEmpty())
return QString();
QFileInfo commandFileInfo(command);
if (commandFileInfo.isExecutable() && commandFileInfo.path() != QLatin1String(".")) {
return commandFileInfo.absoluteFilePath();
} else if (commandFileInfo.path() == QLatin1String(".")){
QString fullCommandFileName = command;
#ifdef Q_OS_WIN
if (!command.endsWith(QLatin1String(".exe")))
fullCommandFileName = command + QLatin1String(".exe");
static const QString pathSeparator(QLatin1Char(';'));
#else
static const QString pathSeparator(QLatin1Char(':'));
#endif
QStringList pathList = environment.value(QLatin1String("PATH")).split(pathSeparator);
foreach (const QString &path, pathList) {
QString filePath(path + QDir::separator() + fullCommandFileName);
if (QFileInfo(filePath).isExecutable())
return commandFileInfo.absoluteFilePath();
}
}
return QString();
}
TestRunner *TestRunner::instance()
{
if (!m_instance)
@@ -157,7 +128,7 @@ static void performTestRun(QFutureInterface<TestResultPtr> &futureInterface,
continue;
QProcessEnvironment environment = testConfiguration->environment().toProcessEnvironment();
QString commandFilePath = executableFilePath(testConfiguration->targetFile(), environment);
QString commandFilePath = testConfiguration->executableFilePath();
if (commandFilePath.isEmpty()) {
futureInterface.reportResult(TestResultPtr(new FaultyTestResult(Result::MessageFatal,
TestRunner::tr("Could not find command \"%1\". (%2)")
@@ -293,8 +264,7 @@ void TestRunner::debugTests()
return;
}
const QString &commandFilePath = executableFilePath(config->targetFile(),
config->environment().toProcessEnvironment());
const QString &commandFilePath = config->executableFilePath();
if (commandFilePath.isEmpty()) {
emit testResultReady(TestResultPtr(new FaultyTestResult(Result::MessageFatal,
TestRunner::tr("Could not find command \"%1\". (%2)")