chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: t-tstunt: When looking for real thing, strip stunt from PATH
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 993ec36b647a44953d1a67d59cb536b7ca5a8969..1af0288aeace7db78adc3b6518af4529dc1972af 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-392,6
+392,7
@@
t-fscks () {
}
t-ok () {
}
t-ok () {
+ : '========================================'
t-fscks
echo ok.
}
t-fscks
echo ok.
}
@@
-406,7
+407,9
@@
t-dgit () {
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
- -dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+ ${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+ $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
-k39B13D8A $t_dgit_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
-k39B13D8A $t_dgit_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
@@
-798,7
+801,14
@@
t-tstunt--save-real () {
local rc
local real
set +e
local rc
local real
set +e
- real=$(type -p "$f")
+ real=$(
+ p=":$PATH:"
+ p="${p/:"$tmp/tstunt":/:}"
+ p="${p%:}"
+ p="${p#:}"
+ PATH="$p"
+ type -p "$f"
+ )
rc=$?
set -e
rc=$?
set -e
@@
-851,7
+861,11
@@
t-incoming-dsc () {
t-ref-dsc-dgit () {
t-incoming-dsc
local val; val=`t-822-field $incoming_dsc Dgit`
t-ref-dsc-dgit () {
t-incoming-dsc
local val; val=`t-822-field $incoming_dsc Dgit`
- perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+ val=$( perl -e '
+ $_=shift @ARGV;
+ die "Dgit $_ ?" unless m/^\w+\b/;
+ print $&,"\n" or die $!;
+ ' "$val")
t-ref-same-val $incoming_dsc "$val"
}
t-ref-same-val $incoming_dsc "$val"
}