diff options
52 files changed, 55 insertions, 51 deletions
@@ -349,6 +349,10 @@ t-git-dir-check () { esac } +t-ok () { + echo ok. +} + t-rm-dput-dropping () { rm -f $tmp/${p}_${v}_*.upload } diff --git a/tests/setup/examplegit b/tests/setup/examplegit index 98900d0..112e27a 100755 --- a/tests/setup/examplegit +++ b/tests/setup/examplegit @@ -50,4 +50,4 @@ push-to master sid t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p" -echo ok. +t-ok diff --git a/tests/setup/gnupg b/tests/setup/gnupg index 97cdb64..d23ecfa 100755 --- a/tests/setup/gnupg +++ b/tests/setup/gnupg @@ -12,4 +12,4 @@ gpg --list-secret t-setup-done 'GNUPGHOME' 'gnupg' -echo ok. +t-ok diff --git a/tests/tests/absurd-gitapply b/tests/tests/absurd-gitapply index c7eea86..90c44be 100755 --- a/tests/tests/absurd-gitapply +++ b/tests/tests/absurd-gitapply @@ -13,4 +13,4 @@ t-dgit clone $p cd $p grep moo moo -echo ok. +t-ok diff --git a/tests/tests/build-modes b/tests/tests/build-modes index 18ead35..c476ec8 100755 --- a/tests/tests/build-modes +++ b/tests/tests/build-modes @@ -32,4 +32,4 @@ for act in \ bm-act-iterate done -echo ok. +t-ok diff --git a/tests/tests/build-modes-gbp b/tests/tests/build-modes-gbp index e8d9c16..50a6288 100755 --- a/tests/tests/build-modes-gbp +++ b/tests/tests/build-modes-gbp @@ -36,4 +36,4 @@ for act in \ bm-act-iterate done -echo ok. +t-ok diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild index f030f71..19dcc8a 100755 --- a/tests/tests/build-modes-sbuild +++ b/tests/tests/build-modes-sbuild @@ -15,4 +15,4 @@ real_act="$act" bm-guess-e-source-e-targets "$act" bm-act-iterate -echo ok. +t-ok diff --git a/tests/tests/clone-clogsigpipe b/tests/tests/clone-clogsigpipe index ff5f303..4465cf3 100755 --- a/tests/tests/clone-clogsigpipe +++ b/tests/tests/clone-clogsigpipe @@ -7,4 +7,4 @@ t-git-none t-dgit clone $p -echo ok. +t-ok diff --git a/tests/tests/clone-nogit b/tests/tests/clone-nogit index 477eb55..e99dac3 100755 --- a/tests/tests/clone-nogit +++ b/tests/tests/clone-nogit @@ -22,4 +22,4 @@ t-dgit push t-pushed-good dgit/sid -echo ok. +t-ok diff --git a/tests/tests/clone-reprepro b/tests/tests/clone-reprepro index 62b4c8d..063a138 100755 --- a/tests/tests/clone-reprepro +++ b/tests/tests/clone-reprepro @@ -30,4 +30,4 @@ t-dgit fetch unstable,stable t-refs-same-start t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid -echo ok. +t-ok diff --git a/tests/tests/debpolicy-dbretry b/tests/tests/debpolicy-dbretry index b2d8093..a9f2334 100755 --- a/tests/tests/debpolicy-dbretry +++ b/tests/tests/debpolicy-dbretry @@ -64,4 +64,4 @@ ls $tmp/sqlite3.rolled-back t-policy-admin list-taints | tee $tmp/taints-list | grep $autotaint -echo ok. +t-ok diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject index 4da568c..1fa6751 100755 --- a/tests/tests/debpolicy-newreject +++ b/tests/tests/debpolicy-newreject @@ -118,4 +118,4 @@ t-expect-push-fail \ 'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \ t-dgit push -echo ok. +t-ok diff --git a/tests/tests/distropatches-reject b/tests/tests/distropatches-reject index 31a3797..75f43db 100755 --- a/tests/tests/distropatches-reject +++ b/tests/tests/distropatches-reject @@ -78,4 +78,4 @@ DEB_VENDOR=test-dummy-aside \ expect-fail-distro-series DEB_VENDOR \ t-dgit clone $p -echo done. +t-ok diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate index 9d2e632..c8a5c5a 100755 --- a/tests/tests/drs-push-masterupdate +++ b/tests/tests/drs-push-masterupdate @@ -47,4 +47,4 @@ git commit --allow-empty -m 'Has no common ancestor' push_and_check +HEAD:master -echo done. +t-ok diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects index f87cbdc..f829dc9 100755 --- a/tests/tests/drs-push-rejects +++ b/tests/tests/drs-push-rejects @@ -191,4 +191,4 @@ mustfail "not in permissions list although in keyring" $push_spec prep_dm_mangle '' mustsucceed $push_spec # succeeds -echo ok. +t-ok diff --git a/tests/tests/dsd-clone-drs b/tests/tests/dsd-clone-drs index 16bfa2e..4346579 100755 --- a/tests/tests/dsd-clone-drs +++ b/tests/tests/dsd-clone-drs @@ -13,4 +13,4 @@ t-dgit clone-dgit-repos-server drs-cloned cd drs-cloned ls -al infra/dgit-repos-server -echo ok. +t-ok diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly index b0ade5f..7d603b2 100755 --- a/tests/tests/fetch-localgitonly +++ b/tests/tests/fetch-localgitonly @@ -17,4 +17,4 @@ t-dgit pull t-cloned-fetched-good t-has-ancestor $old -echo ok. +t-ok diff --git a/tests/tests/fetch-somegit-notlast b/tests/tests/fetch-somegit-notlast index 15b9404..63abe8a 100755 --- a/tests/tests/fetch-somegit-notlast +++ b/tests/tests/fetch-somegit-notlast @@ -12,4 +12,4 @@ cd $p t-cloned-fetched-good t-has-ancestor debian/3-1 -echo ok. +t-ok diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig index 29dd457..beea121 100755 --- a/tests/tests/gbp-orig +++ b/tests/tests/gbp-orig @@ -74,4 +74,4 @@ done cd $tmp diff -ruN gbp-output/tar-x tar-x -echo done. +t-ok diff --git a/tests/tests/gitconfig b/tests/tests/gitconfig index 263d733..12b342b 100755 --- a/tests/tests/gitconfig +++ b/tests/tests/gitconfig @@ -35,4 +35,4 @@ t-dgit clean t-dgit -cdgit.default.clean-mode=none clean -echo ok. +t-ok diff --git a/tests/tests/import-dsc b/tests/tests/import-dsc index 98092a2..b86eef6 100755 --- a/tests/tests/import-dsc +++ b/tests/tests/import-dsc @@ -96,4 +96,4 @@ test "x$mb" = x t-expect-fail 'signature check failed' \ t-dgit import-dsc --require-valid-signature $dsc2 +$branch -echo ok. +t-ok diff --git a/tests/tests/import-native b/tests/tests/import-native index d07cd9d..1e09343 100755 --- a/tests/tests/import-native +++ b/tests/tests/import-native @@ -66,4 +66,4 @@ for v in $versions; do lastv_imp=$this_imp done -echo ok. +t-ok diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative index d324172..3568563 100755 --- a/tests/tests/import-nonnative +++ b/tests/tests/import-nonnative @@ -14,4 +14,4 @@ t-import-chk example 1.0-1 # 3.0 (quilt), single-debian-patch, one orig t-import-chk sunxi-tools 1.2-2.~~dgittest -echo done. +t-ok diff --git a/tests/tests/import-tarbomb b/tests/tests/import-tarbomb index c0bc4c4..9b7f65a 100755 --- a/tests/tests/import-tarbomb +++ b/tests/tests/import-tarbomb @@ -46,4 +46,4 @@ echo SPONG >.pc/SPONG tar zvcf ../$orig . mangle2 -echo done. +t-ok diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy index b34ba33..b1e0c5f 100755 --- a/tests/tests/inarchivecopy +++ b/tests/tests/inarchivecopy @@ -76,4 +76,4 @@ cd .. copy-check 2.1 testing -echo ok. +t-ok diff --git a/tests/tests/mirror b/tests/tests/mirror index 95c1cdb..4947688 100755 --- a/tests/tests/mirror +++ b/tests/tests/mirror @@ -77,4 +77,4 @@ done t-check-mirrored -echo done. +t-ok diff --git a/tests/tests/mirror-private b/tests/tests/mirror-private index 4033835..c26ba89 100755 --- a/tests/tests/mirror-private +++ b/tests/tests/mirror-private @@ -23,4 +23,4 @@ t-dgit push --new t-check-not-mirrored t-files-notexist $reposmirror/$p.* -echo ok. +t-ok diff --git a/tests/tests/mismatches-contents b/tests/tests/mismatches-contents index b7c53f2..ea0d724 100755 --- a/tests/tests/mismatches-contents +++ b/tests/tests/mismatches-contents @@ -21,4 +21,4 @@ t-dgit build-source t-expect-fail 'debian/TRASH' \ t-dgit push --new -echo ok. +t-ok diff --git a/tests/tests/mismatches-dscchanges b/tests/tests/mismatches-dscchanges index 9bb554e..85c7086 100755 --- a/tests/tests/mismatches-dscchanges +++ b/tests/tests/mismatches-dscchanges @@ -31,4 +31,4 @@ t-dgit -wgf build-source t-dgit -wgf push --new -echo ok. +t-ok diff --git a/tests/tests/multisuite b/tests/tests/multisuite index 0a580be..d39475b 100755 --- a/tests/tests/multisuite +++ b/tests/tests/multisuite @@ -54,4 +54,4 @@ multi-good t-has-parent-or-is HEAD $rcombined -echo ok. +t-ok diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt index cb270b2..098fe19 100755 --- a/tests/tests/oldnewtagalt +++ b/tests/tests/oldnewtagalt @@ -21,5 +21,5 @@ for count in 1 2; do test-push "newtag $count" done -echo ok. +t-ok diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude index 5617a1e..a37f997 100755 --- a/tests/tests/orig-include-exclude +++ b/tests/tests/orig-include-exclude @@ -18,4 +18,4 @@ test-push-1 1.1-1.3 '' stable t-expect-fail E:'archive contains .* with different checksum' \ test-push-2 --new -echo done. +t-ok diff --git a/tests/tests/orig-include-exclude-chkquery b/tests/tests/orig-include-exclude-chkquery index 59fc80f..f8eac57 100755 --- a/tests/tests/orig-include-exclude-chkquery +++ b/tests/tests/orig-include-exclude-chkquery @@ -30,4 +30,4 @@ test_push_2_hook=update-files_in_archive . $troot/lib-orig-include-exclude -echo done. +t-ok diff --git a/tests/tests/overwrite-chkclog b/tests/tests/overwrite-chkclog index 25356a8..3544390 100755 --- a/tests/tests/overwrite-chkclog +++ b/tests/tests/overwrite-chkclog @@ -36,4 +36,4 @@ git revert --no-edit 'HEAD^{/Break changelog}' t-dgit push --overwrite stable -echo done. +t-ok diff --git a/tests/tests/overwrite-junk b/tests/tests/overwrite-junk index 2f8fd70..e11d1f8 100755 --- a/tests/tests/overwrite-junk +++ b/tests/tests/overwrite-junk @@ -19,4 +19,4 @@ t-dgit -wgf build t-dgit push --overwrite=1.2 stable -echo ok. +t-ok diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains index 725357d..0ef03f6 100755 --- a/tests/tests/overwrite-splitbrains +++ b/tests/tests/overwrite-splitbrains @@ -24,4 +24,4 @@ t-dgit --quilt=gbp --dgit-view-save=split.p --overwrite push t-gbp-pushed-good -echo ok. +t-ok diff --git a/tests/tests/overwrite-version b/tests/tests/overwrite-version index 34ee014..34301ac 100755 --- a/tests/tests/overwrite-version +++ b/tests/tests/overwrite-version @@ -17,4 +17,4 @@ t-dgit push stable t-dgit push --overwrite=1.2 stable -echo ok. +t-ok diff --git a/tests/tests/push-buildproductsdir b/tests/tests/push-buildproductsdir index 987c081..505d105 100755 --- a/tests/tests/push-buildproductsdir +++ b/tests/tests/push-buildproductsdir @@ -28,4 +28,4 @@ t-dgit --build-products-dir=../bpd push t-pushed-good dgit/sid -echo ok. +t-ok diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage index d0f3f35..79355e3 100755 --- a/tests/tests/push-newpackage +++ b/tests/tests/push-newpackage @@ -27,4 +27,4 @@ t-dgit push --new t-pushed-good master -echo ok. +t-ok diff --git a/tests/tests/push-nextdgit b/tests/tests/push-nextdgit index 8d4a36f..d0436ab 100755 --- a/tests/tests/push-nextdgit +++ b/tests/tests/push-nextdgit @@ -22,4 +22,4 @@ t-dgit push t-pushed-good dgit/sid -echo ok. +t-ok diff --git a/tests/tests/quilt b/tests/tests/quilt index 0462f1a..1a921b3 100755 --- a/tests/tests/quilt +++ b/tests/tests/quilt @@ -93,4 +93,4 @@ do mv ../this.cmp ../last.cmp done -echo ok. +t-ok diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index 38d2489..3ef89e8 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -58,4 +58,4 @@ t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source test-push-2 -echo ok. +t-ok diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes index b89c26e..cd77dab 100755 --- a/tests/tests/quilt-gbp-build-modes +++ b/tests/tests/quilt-gbp-build-modes @@ -10,4 +10,4 @@ bm-gbp-example-acts \ 'gbp-build -S' \ 'gbp-build -b' \ -echo ok. +t-ok diff --git a/tests/tests/quilt-gbp-build-modes-sbuild b/tests/tests/quilt-gbp-build-modes-sbuild index 8da93d3..4c86bfe 100755 --- a/tests/tests/quilt-gbp-build-modes-sbuild +++ b/tests/tests/quilt-gbp-build-modes-sbuild @@ -9,4 +9,4 @@ t-restrict x-dgit-schroot-build bm-gbp-example-acts \ 'sbuild -c build --arch-all' \ -echo ok. +t-ok diff --git a/tests/tests/quilt-singlepatch b/tests/tests/quilt-singlepatch index 6a04329..3b6e228 100755 --- a/tests/tests/quilt-singlepatch +++ b/tests/tests/quilt-singlepatch @@ -36,4 +36,4 @@ debian-changes series END -echo ok. +t-ok diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains index 112bc39..9f0ae5f 100755 --- a/tests/tests/quilt-splitbrains +++ b/tests/tests/quilt-splitbrains @@ -137,4 +137,4 @@ t-commit dpmish-stable 1.0-6 $suite want-success dpm --new -echo ok. +t-ok diff --git a/tests/tests/rpush b/tests/tests/rpush index c627788..71bbe2b 100755 --- a/tests/tests/rpush +++ b/tests/tests/rpush @@ -28,4 +28,4 @@ t-dgit --ssh=$troot/ssh rpush somehost:$tmp/$p cd $tmp/$p t-pushed-good dgit/sid -echo ok. +t-ok diff --git a/tests/tests/spelling b/tests/tests/spelling index 74541b7..ed1290c 100755 --- a/tests/tests/spelling +++ b/tests/tests/spelling @@ -13,4 +13,4 @@ set -e test $rc = 1 -echo ok. +t-ok diff --git a/tests/tests/tag-updates b/tests/tests/tag-updates index 8c6ab09..824fd1e 100755 --- a/tests/tests/tag-updates +++ b/tests/tests/tag-updates @@ -34,4 +34,4 @@ t-refs-same-start t-ref-same-exact $tagref fetch-check -echo done. +t-ok diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay index 2039ec6..ad731f5 100755 --- a/tests/tests/trustingpolicy-replay +++ b/tests/tests/trustingpolicy-replay @@ -82,4 +82,4 @@ t-dgit push attempt-replay "does not declare previously tags/$tagpfx/$v" -echo ok. +t-ok diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index 5b3e139..0d02c6a 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -49,4 +49,4 @@ badly-2 start attempt -echo ok. +t-ok diff --git a/tests/tests/version-opt b/tests/tests/version-opt index 93c6a45..22c35e7 100755 --- a/tests/tests/version-opt +++ b/tests/tests/version-opt @@ -29,4 +29,4 @@ done fgrep 'Update to version 1.1' ../${p}_${v}_source.changes -echo ok. +t-ok |