test suite: Generalise DGIT_TEST_REAL_<FOO> handling

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 5d4560f2925e7d7ebb8700a4061940d3e06de89f..3e3aa574076a1e72646070001ec1ac412cc7e780 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (2.17~) unstable; urgency=medium
 
-  * 
+  Test suite:
+  * Internal improvements.
 
  --
 

diff --git a/tests/lib b/tests/lib
index 50d614ee16e1346f302b2a58ef64a067b3d6dbc9..993ec36b647a44953d1a67d59cb536b7ca5a8969 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -789,12 +789,41 @@ t-stunt-envvar () {
        '
 }
 
+t-tstunt--save-real () {
+       local f="$1"
+       case "$f" in
+       */*) return ;;
+       esac
+
+       local rc
+       local real
+       set +e
+       real=$(type -p "$f")
+       rc=$?
+       set -e
+
+       case $rc in
+       1)      return ;;
+       0)      ;;
+       *)      fail "did not find $f on PATH $PATH" ;;
+       esac
+
+       local varname=${f//[^_0-9a-zA-Z]/_}
+       varname=DGIT_TEST_REAL_${varname^^}
+
+       eval "
+               : \${$varname:=\$real}
+               export $varname
+       "
+}
+
 t-tstunt () {
        local tstunt=$tmp/tstunt
        t-stunt-envvar PATH $tstunt
        t-stunt-envvar PERLLIB $tstunt
        local f
        for f in "$@"; do
+               t-tstunt--save-real $f
                f="./$f"
                local d="$tstunt/${f%/*}"
                mkdir -p $d
@@ -811,8 +840,6 @@ t-tstunt-lintian () {
 }
 
 t-tstunt-debuild () {
-       : ${DGIT_TEST_REAL_DEBUILD:=$(type -p debuild)}
-       export DGIT_TEST_REAL_DEBUILD
        t-tstunt debuild
 }