diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-31 14:04:58 +0800 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-31 14:04:58 +0800 |
commit | 3c5614c2292cb2fa1c50915d18510f5c2c915b76 (patch) | |
tree | 37703aa7eda0ad83849308db586566c1f23d6fae /tests/lib-import-chk | |
parent | e21dbf9b02e32aec335262b2999686c37f01ba00 (diff) | |
parent | f052e1326357a6365a5eddbb985a5b1ef9b4fdb2 (diff) |
Merge tag 'debian/6.2' into stretch-bpo
dgit release 6.2 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 29 Jul 2018 08:02:30 PM CST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/lib-import-chk')
-rw-r--r-- | tests/lib-import-chk | 22 |
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 .. } |