diff --git a/scripts/ci-github.sh b/scripts/ci-github.sh index f1b49e7ed..135adce1d 100755 --- a/scripts/ci-github.sh +++ b/scripts/ci-github.sh @@ -114,6 +114,6 @@ $run_python ../scripts/python/check_finalize_exceptions.py ../src echo ............................ echo Running test suite now: -$run_python ./run.py -E || { echo Test suite failures, unstable build!; exit 1; } +$run_python ./run.py --show-time-info -E || { echo Test suite failures, unstable build!; exit 1; } cd .. echo ............................ diff --git a/testsuite/drivers/driver/python_script.py b/testsuite/drivers/driver/python_script.py index 08279299b..79030dba3 100644 --- a/testsuite/drivers/driver/python_script.py +++ b/testsuite/drivers/driver/python_script.py @@ -2,6 +2,7 @@ import os import shutil import sys +import time from drivers.alr import prepare_env, prepare_indexes, run_alr from drivers.driver.base_driver import BaseDriver @@ -151,6 +152,8 @@ def run(self): if mode == "both": self.save_working_dir() + start_time = time.time() + # First run with shared builds disabled if mode in ["sandboxed", "both"]: @@ -173,3 +176,5 @@ def run(self): "dependencies.shared", "true") p = self.run_script(copy.deepcopy(pristine_env)) self.check_result(p) + + self.result.time = time.time() - start_time diff --git a/testsuite/run-dev.sh b/testsuite/run-dev.sh index 964cd9914..adca8744a 100755 --- a/testsuite/run-dev.sh +++ b/testsuite/run-dev.sh @@ -16,4 +16,4 @@ if [ -z "$GH_USERNAME" ]; then echo fi -./run.py -M1 "$@" +./run.py --show-time-info -M1 "$@" diff --git a/testsuite/run-solver.sh b/testsuite/run-solver.sh index 63472d895..c54d8cf2f 100755 --- a/testsuite/run-solver.sh +++ b/testsuite/run-solver.sh @@ -4,8 +4,10 @@ set -o errexit # Run subset of tests most likely to find a change in the solver's behavior +opts=--show-time-info -M1 + clear -python3 run.py -M1 solver/"$@" -python3 run.py -M1 with/"$@" -python3 run.py -M1 pin/"$@" -python3 run.py -M1 get/"$@" +python3 run.py $opts solver/"$@" +python3 run.py $opts with/"$@" +python3 run.py $opts pin/"$@" +python3 run.py $opts get/"$@" diff --git a/testsuite/run.sh b/testsuite/run.sh index 4a2162365..adea60826 100755 --- a/testsuite/run.sh +++ b/testsuite/run.sh @@ -1,4 +1,4 @@ #!/bin/bash clear -python3 run.py -M1 "$@" +python3 run.py --show-time-info -M1 "$@"