diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-02 17:02:07 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 11:54:07 +0100 |
commit | 9ff6957e842708e9641ad00510f336b347bff302 (patch) | |
tree | 00f4188c30e4ce6a3dc69317f0e233ce2edd7bb8 | |
parent | f08a465fb0a346019750c62dd6cdf1eed348e032 (diff) |
DGIT_TEST_DEBUG: Improve plumbing and honour in policy hook. Also honour $dgitlive
-rwxr-xr-x | infra/dgit-repos-policy-debian | 4 | ||||
-rw-r--r-- | tests/lib | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index 0c7d888..83ce793 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -79,7 +79,9 @@ our %deliberately; sub apiquery ($) { my ($subpath) = @_; local $/=undef; - $!=0; $?=0; my $json = `dgit -d $distro archive-api-query $subpath`; + my $cmd = "$dgitlive/dgit -d $distro ". + "\$DGIT_TEST_OPTS \$DGIT_TEST_DEBUG archive-api-query $subpath"; + $!=0; $?=0; my $json = `$cmd`; defined $json or die "$subpath $! $?"; return decode_json $json; } @@ -11,6 +11,9 @@ if [ "x$DGIT_TEST_INTREE" != x ]; then export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST fi +: ${DGIT_TEST_DEBUG:=-D} +export DGIT_TEST_DEBUG + root=`pwd` troot=$root/tests testname="${DGIT_TEST_TESTNAME-${0##*/}}" @@ -180,7 +183,7 @@ t-dgit () { : ' {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \ - -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \ + -dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \ -k39B13D8A "$@" : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} ' |