summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2022-05-03 11:20:50 +0200
committerDominik Holland <dominik.holland@qt.io>2022-05-17 16:14:54 +0200
commitefb7b784cb8a0f6c29cdd6db48205961dac45fd7 (patch)
treefb798853bdf1d4c4da9a683a45c0ef28e40d9088
parentc6eb8b8aff9c8a2954f6827848c3af305b05b17f (diff)
downloadqtapplicationmanager-efb7b784cb8a0f6c29cdd6db48205961dac45fd7.tar.gz
Use AM_TIMEOUT_FACTOR=6 for all tests on the CI
Because of different build environment used for qt5 builds, we are not able to alter the test environment and have to build in some hardcoded values for the CI. Change-Id: I2211fa738e9cbe8d1cd728c1c024f70acdfdd1bd Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/common-lib/utilities.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common-lib/utilities.cpp b/src/common-lib/utilities.cpp
index 41e1535a..ccc8ae56 100644
--- a/src/common-lib/utilities.cpp
+++ b/src/common-lib/utilities.cpp
@@ -206,6 +206,10 @@ int timeoutFactor()
static int tf = 0;
if (!tf) {
tf = qMax(1, qEnvironmentVariableIntValue("AM_TIMEOUT_FACTOR"));
+ if (tf == 1 && qEnvironmentVariable("QTEST_ENVIRONMENT") == qSL("ci")) {
+ tf = 6;
+ qInfo() << "Detected CI environment. Setting AM_TIMEOUT_FACTOR to 6";
+ }
if (tf > 1)
qInfo() << "All timeouts are multiplied by" << tf << "(changed by (un)setting $AM_TIMEOUT_FACTOR)";
}