X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=a050522890c49fe8bed8076c7584a7ac2dfcc314;hb=1e8530a75b48e9444c3f629eea2e1414e001b76c;hp=7220de51534f1e4a9a513cd983539c62e9dd6287;hpb=4fb9b340d818b131457079f24c500a5f325977af;p=dgit.git diff --git a/tests/lib b/tests/lib index 7220de51..a0505228 100644 --- a/tests/lib +++ b/tests/lib @@ -92,7 +92,9 @@ t-expect-fail () { local mpat="$1"; shift set +o pipefail - LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output + LC_MESSAGES=${expect_fail_lcmessages-C} \ + LANGUAGE=${expect_fail_lcmessages-C} \ + "$@" 2>&1 | tee $tmp/t.output local ps="${PIPESTATUS[*]}" set -o pipefail @@ -404,6 +406,13 @@ t-git-fsck () { esac } +t-check-only-bpd () { + if [ "$bpd" = .. ]; then return; fi + t-files-notexist \ + $tmp/*.{deb,changes,dsc,buildinfo} \ + $tmp/*.{tar,diff}.* +} + t-fscks () { ( shopt -s nullglob @@ -416,6 +425,7 @@ t-fscks () { t-ok () { : '========================================' + t-check-only-bpd t-fscks t-save-artifacts echo ok. @@ -1032,7 +1042,7 @@ t-make-orig () { local v=$2 local tag=${3-v$2} ust=${p}_${v}.orig.tar.gz - GZIP=-1 git archive -o ../$ust --prefix=${p}-${v}/ $tag + GZIP=-1 git archive -o $bpd/$ust --prefix=${p}-${v}/ $tag } t-merge-conflicted-stripping-conflict-markers () {