aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-12-17 16:04:53 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-18 15:56:17 +0000
commit5b69e17405df7d903dd7da9b506cbba74de14147 (patch)
tree83f96fdbb55797a09bae4c1e4f99cb0396a38d8c
parent022d55f32606bcc4dd7eec9cea7fe2746f3f7218 (diff)
ecmascript tests: Also raise timeout when built with cmake
pro2cmake did not convert the QTEST_FUNCTION_TIMEOUT environment variable. As a result, when the test runs for more than 300s, it gets killed by the watchdog. Change-Id: I370d2c1b7a129c41d690d41e84f0a51810d37160 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d5ac54da624dbaebc865c8243a5e1c33d5e1c7ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/qml/ecmascripttests/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt
index 040e5d08c6..ddd9260bf7 100644
--- a/tests/auto/qml/ecmascripttests/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt
@@ -14,6 +14,10 @@ qt_internal_add_test(tst_ecmascripttests
Qt::QmlPrivate
)
+# special case begin
+set_property(TEST tst_ecmascripttests APPEND PROPERTY ENVIRONMENT "QTEST_FUNCTION_TIMEOUT=500000")
+# special case end
+
#### Keys ignored in scope 2:.:.:testcase.pro:<TRUE>:
# QT_TOOL_ENV = "checkenv"
# checkenv.name = "QTEST_FUNCTION_TIMEOUT"