summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/run-tests.py2
-rwxr-xr-xtools/ci.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/run-tests.py b/tests/run-tests.py
index d1d22a3c5..faf1d2e3b 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -16,7 +16,7 @@ import threading
import tempfile
# Maximum time to run a PC-based test, in seconds.
-TEST_TIMEOUT = 30
+TEST_TIMEOUT = float(os.environ.get('MICROPY_TEST_TIMEOUT', 30))
# See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
# are guaranteed to always work, this one should though.
diff --git a/tools/ci.sh b/tools/ci.sh
index 2f62f3efe..2f0b74242 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -625,7 +625,7 @@ function ci_unix_coverage_build {
}
function ci_unix_coverage_run_tests {
- ci_unix_run_tests_full_helper coverage
+ MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage
}
function ci_unix_coverage_run_mpy_merge_tests {
@@ -745,7 +745,7 @@ function ci_unix_sanitize_undefined_build {
}
function ci_unix_sanitize_undefined_run_tests {
- ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
+ MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_UNDEFINED[@]}"
}
function ci_unix_sanitize_address_build {
@@ -756,7 +756,7 @@ function ci_unix_sanitize_address_build {
}
function ci_unix_sanitize_address_run_tests {
- ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
+ MICROPY_TEST_TIMEOUT=60 ci_unix_run_tests_full_helper coverage "${CI_UNIX_OPTS_SANITIZE_ADDRESS[@]}"
}
function ci_unix_macos_build {