Test suite: Allow for t-stunt to override Perl modules

diff --git a/tests/lib b/tests/lib
index 1a9b0420c48426b72739698751ab5ed379a81f63..5adcf0b69bca032a863bcec6f4c98aea34b8780a 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -323,17 +323,28 @@ t-822-field () {
        ' <$file
 }
 
+t-stunt-envvar () {
+       local var=$1
+       local tstunt=$2
+       eval '
+               case "'$var'" in
+               "$tstunt:"*)    ;;
+               *":$tstunt:"*)  ;;
+               *)              '$var'="$tstunt:$'$var'" ;;
+               esac
+       '
+}
+
 t-tstunt () {
        local tstunt=$tmp/tstunt
-       mkdir -p $tstunt
-       case "$PATH" in
-       "$tstunt:"*)    ;;
-       *":$tstunt:"*)  ;;
-       *)              PATH="$tstunt:$PATH" ;;
-       esac
+       t-stunt-envvar PATH $tstunt
+       t-stunt-envvar PERLLIB $tstunt
        local f
        for f in "$@"; do
-               ln -sf "$troot/tstunt/$f" "$tstunt"/.
+               f="./$f"
+               local d="$tstunt/${f%/*}"
+               mkdir -p $d
+               ln -sf "$troot/tstunt/$f" "$d"/.
        done
 }