diff options
| author | Wayne Davison <wayned@samba.org> | 2009-12-15 08:44:46 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2009-12-15 08:44:46 -0800 |
| commit | 6e9ad2bb0356da85a7ca8283acd3558b39e2138e (patch) | |
| tree | e62526b919d197829e8648cbf9ca05b4c2f62b4c /runtests.sh | |
| parent | c5130bc123aa5ddf7b10528a36fefbab1669084b (diff) | |
| download | rsync-6e9ad2bb0356da85a7ca8283acd3558b39e2138e.tar.gz | |
Allow per-test timeout overrides. Give hardlinks more time.
Diffstat (limited to 'runtests.sh')
| -rwxr-xr-x | runtests.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtests.sh b/runtests.sh index db95d8f7..43732cea 100755 --- a/runtests.sh +++ b/runtests.sh @@ -229,8 +229,9 @@ echo " scratchbase=$scratchbase" [ -d "$scratchbase" ] || mkdir "$scratchbase" suitedir="$srcdir/testsuite" +TESTRUN_TIMEOUT=300 -export scratchdir suitedir +export scratchdir suitedir TESTRUN_TIMEOUT prep_scratch() { [ -d "$scratchdir" ] && chmod -R u+rwX "$scratchdir" && rm -rf "$scratchdir" @@ -261,6 +262,11 @@ do prep_scratch + case "$testscript" in + *hardlinks*) TESTRUN_TIMEOUT=600 ;; + *) TESTRUN_TIMEOUT=300 ;; + esac + set +e "$TOOLDIR/"testrun $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1 result=$? |