File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ echo "travis_fold:end:cmake"
68
68
# uploading and subtract the bootstrapping time from that.
69
69
# Hopefully clocks are in sync :)
70
70
TRAVIS_TIME=90
71
- UPLOAD_TIME=8
71
+ UPLOAD_TIME=5
72
72
CURRENT_TIME=` date +%s`
73
73
TIMEOUT=$( expr \( ${TRAVIS_TIME} - ${UPLOAD_TIME} \) \* 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP} )
74
74
TIMEOUT=$(( ${TIMEOUT} < 300 ? 300 : ${TIMEOUT} ))
@@ -106,7 +106,15 @@ popd > /dev/null # /root/QGIS
106
106
# ##########
107
107
# Run tests
108
108
# ##########
109
- python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E " $( cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r ' /^(#.*?)?$/d' | paste -sd ' |' -) " -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
109
+ CURRENT_TIME=` date +%s`
110
+ TIMEOUT=$( expr \( ${TRAVIS_TIME} - ${UPLOAD_TIME} \) \* 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP} )
111
+ echo " Timeout: ${TIMEOUT} s (started at ${TRAVIS_TIMESTAMP} , current: ${CURRENT_TIME} )"
112
+ timeout ${TIMEOUT} s python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E " $( cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r ' /^(#.*?)?$/d' | paste -sd ' |' -) " -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
113
+ rv=$?
114
+ if [ $rv -eq 124 ] ; then
115
+ printf ' \n\n${bold}Build and test timeout. Please restart the build for meaningful results.${endbold}\n'
116
+ exit # $rv
117
+ fi
110
118
111
119
# #######################
112
120
# Show ccache statistics
You can’t perform that action at this time.
0 commit comments