summaryrefslogtreecommitdiff
path: root/tests/lib-import-chk
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-29 05:06:15 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-29 05:06:15 +0100
commitf7b93ef468c428d828884f83b8fd82b15aa7da34 (patch)
tree77681088d9c677d66aaa9478c9a5de643670d90c /tests/lib-import-chk
parent3028f34f1868b3726f856ede688437b5279c2b05 (diff)
test suite: lib-import-chk: Honour $bpd
No functional change because none of the import tests set this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-import-chk')
-rw-r--r--tests/lib-import-chk22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/lib-import-chk b/tests/lib-import-chk
index d6633f9..e18f66e 100644
--- a/tests/lib-import-chk
+++ b/tests/lib-import-chk
@@ -45,7 +45,7 @@ t-import-chk2() {
# The resulting .dsc does not have a Dgit line (because dgit push
# puts that in). So we just shove it in the archive now
- ln ../${p}_${v}.* $tmp/mirror/pool/main/
+ ln $bpd/${p}_${v}.* $tmp/mirror/pool/main/
t-archive-query
t-dgit fetch
@@ -62,9 +62,9 @@ t-import-chk2() {
t-ref-same refs/remotes/dgit/dgit/sid
t-ref-same refs/heads/first-2nd-import
- for orig in ../${p}_${v%-*}.orig*.tar.*; do
- tar -atf $orig | t-sort >../files.o
- pfx=$(perl <../files.o -ne '
+ for orig in $bpd/${p}_${v%-*}.orig*.tar.*; do
+ tar -atf $orig | t-sort >$bpd/files.o
+ pfx=$(perl <$bpd/files.o -ne '
while (<>) {
m#^([^/]+/)# or exit 0;
$x //= $1;
@@ -75,20 +75,20 @@ t-import-chk2() {
perl -i~ -pe '
s#^\Q'"$pfx"'\E##;
$_="" if m/^$/ || m#/$# || m#^\.git/#;
- ' ../files.o
- orig=${orig#../}
+ ' $bpd/files.o
+ orig=${orig#$bpd/}
pat="^Import ${orig//./\\.}\$"
t-refs-same-start
for start in first-import first-2nd-import; do
git log --pretty='tformat:%H' --grep "$pat" $start \
- >../t.imp
- test $(wc -l <../t.imp) = 1
- imp=$(cat ../t.imp)
+ >$bpd/t.imp
+ test $(wc -l <$bpd/t.imp) = 1
+ imp=$(cat $bpd/t.imp)
t-ref-same-val "$orig $start" "$imp"
done
git ls-tree -r --name-only "$t_ref_val:" \
- | t-sort >../files.g
- diff ../files.{o,g}
+ | t-sort >$bpd/files.g
+ diff $bpd/files.{o,g}
done
cd ..
}