Dgit: Break out $tarball_f_ext_re.

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index e6af12a65945ca5e087ed56aea269ad041cc5843..bf94fbaedc4c21529b705af2bc0b561cd13b4ddb 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -3,6 +3,8 @@
 : ${GDR_TEST_DEBUG=-D}
 export GDR_TEST_DEBUG
 
+t-tstunt debchange
+
 t-git-debrebase () {
        local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
        : '
@@ -227,11 +229,9 @@ t-some-changes () {
 t-make-new-upstream-tarball () {
        local uv=$1
        git checkout make-upstream
-       # leaves ust set to filename of orig tarball
        echo "upstream $uv" >>docs/README
        git commit -a -m "upstream $uv tarball"
-       ust=example_$uv.orig.tar.gz
-       git archive -o ../$ust --prefix=example-2.0/ make-upstream
+       t-make-orig example $uv make-upstream
 }
 
 t-nmu-upload-1 () {
@@ -260,17 +260,7 @@ t-nmu-upload-2 () {
 
 t-nmu-upload-3 () {
        t-dch-commit-r
-
-       t-dgit -wgf build-source
-
-       cd ..
-       c=${p}_${v}_source.changes
-       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-       dput -c $tmp/dput.cf test-dummy $c
-
-       t-archive-process-incoming sid
-       t-git-next-date
-       cd $p
+       t-non-dgit-upload
        git checkout master
 }