changelog: start 7.1~

[dgit.git] / tests / lib-import-chk

diff --git a/tests/lib-import-chk b/tests/lib-import-chk
index d6633f96316057f9f2fe96792e493ff850ea91e0..e18f66e5b99e560978a1da127e536db23f0f3daa 100644 (file)
--- 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 ..
 }