diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2018-05-30 12:41:05 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2018-05-31 07:34:47 +0000 |
| commit | 4b0a4c16600313afe209f1678579c2623b9f5fe3 (patch) | |
| tree | 9f3f5c845ba88ecfca2389b9a3e96466e6acccc7 | |
| parent | cb70c38ca2ceb370e191fc5510c8faa59ed0007e (diff) | |
| download | qt-creator-4b0a4c16600313afe209f1678579c2623b9f5fe3.tar.gz | |
AutoTest: Fix build key handling
The build system targets no more contain the additional
pipe character. This patch fixes some 'guessed config'
warnings.
The check for the build key can now also be done
without restriction as it is unique nowadays not only
for Qbs builds.
Change-Id: Ic4e62d678c2188d0591c618cdcc156580b40b834
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/autotest/testconfiguration.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 95e6fb7388..5217ece730 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -193,15 +193,12 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) // not the best approach - but depending on the build system and whether the executables // are going to get installed or not we have to soften the condition... const QString currentExecutable = ensureExeEnding(runnable.executable); - const QString currentBST = runConfig->buildKey() + '|'; + const QString currentBST = runConfig->buildKey(); qCDebug(LOG) << " CurrentExecutable" << currentExecutable; qCDebug(LOG) << " BST of RunConfig" << currentBST; - const bool isQbs = runConfig->id().toString().startsWith("Qbs.RunConfiguration:"); // BAD! if ((localExecutable == currentExecutable) || (deployedExecutable == currentExecutable) - || (isQbs && Utils::anyOf(buildSystemTargets, [currentBST] (const QString &b) { - return b.startsWith(currentBST); - }))) { + || (buildSystemTargets.contains(currentBST))) { qCDebug(LOG) << " Using this RunConfig."; m_origRunConfig = runConfig; m_runnable = runnable; @@ -240,7 +237,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) } if (m_displayName.isEmpty()) // happens e.g. when guessing the TestConfiguration or error - m_displayName = (*buildSystemTargets.begin()).split('|').first(); + m_displayName = (*buildSystemTargets.begin()); } /** |