From e1678640638f8e1ce0cd52ccc2f268468afa9751 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 3 Jun 2014 14:06:58 +0200 Subject: [PATCH] Squish: Avoid pointless waiting and warning in selectBuildConfig() Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d Reviewed-by: Christian Stenger --- tests/system/shared/build_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index dfedf095960..51eb4c71d04 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -164,8 +164,8 @@ def iterateBuildConfigs(kitCount, filter = ""): def selectBuildConfig(targetCount, currentTarget, configName, afterSwitchTo=ViewConstants.EDIT): switchViewTo(ViewConstants.PROJECTS) switchToBuildOrRunSettingsFor(targetCount, currentTarget, ProjectSettings.BUILD) - selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) - progressBarWait(30000) + if selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName) or targetCount > 1: + progressBarWait(30000) return getQtInformationForBuildSettings(targetCount, True, afterSwitchTo) # This will not trigger a rebuild. If needed, caller has to do this.