X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/928da42359dff226f7f1fbcb36d3c150c4e95ba9..554dc122f271fc361b963067fa3d80084fd7ca91:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 41d566bf..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,8 +262,13 @@ do
 
     prep_scratch
 
+    case "$testscript" in
+    *hardlinks*) TESTRUN_TIMEOUT=600 ;;
+    *) TESTRUN_TIMEOUT=300 ;;
+    esac
+
     set +e
-    sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
+    "$TOOLDIR/"testrun $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1
     result=$?
     set -e