From 6d69f86475d897aaf3b565d24ceaf21640c615f7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 30 May 2015 13:50:36 +0100
Subject: [PATCH] Test suite: Allow for t-stunt to override Perl modules

---
 tests/lib | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/lib b/tests/lib
index 1a9b0420..5adcf0b6 100644
--- 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
 }
 
-- 
2.30.2