From: Ian Jackson Date: Sat, 8 Oct 2016 19:21:35 +0000 (+0100) Subject: Test suite: import-nonnative: Enhanced and finished X-Git-Tag: archive/debian/2.0~78 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3a434e0ecac4387bb900a078b7d65c751b99f3bb Test suite: import-nonnative: Enhanced and finished Use t-git-next-date. (Our GIT_AUTHOR_DATE settings were wrong and therefore ineffective.) Add a 1.0 with diff test. Add some comments about package format. Now the test is finished. Signed-off-by: Ian Jackson --- diff --git a/debian/tests/control b/debian/tests/control index 11390299..4b0afe60 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -21,7 +21,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts Restrictions: x-dgit-git-only -Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast import-native import-quilt inarchivecopy newtag-clone-nogit oldnewtagalt oldtag-clone-nogit overwrite-chkclog overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay +Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast import-native import-nonnative inarchivecopy newtag-clone-nogit oldnewtagalt oldtag-clone-nogit overwrite-chkclog overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts diff --git a/tests/tests/import-quilt b/tests/tests/import-nonnative similarity index 85% rename from tests/tests/import-quilt rename to tests/tests/import-nonnative index 08ea866c..98076f06 100755 --- a/tests/tests/import-quilt +++ b/tests/tests/import-nonnative @@ -12,8 +12,6 @@ chk () { t-git-none t-dgit --no-rm-on-error clone $p - echo xxx do some basic checks - # And now we make an update using the same orig tarball, and # check that the orig import is stable. @@ -43,8 +41,9 @@ chk () { git branch first-2nd-import remotes/dgit/dgit/sid - export GIT_AUTHOR_DATE=1475947851 - export GIT_COMMITTER_DATE=1475947851 + t-git-next-date + + git update-ref refs/remotes/dgit/dgit/sid first-import t-dgit fetch @@ -67,8 +66,13 @@ chk () { cd .. } +# 1.0 with diff +chk pari-extra 3-1 + +# 3.0 (quilt), multiple patches, multiple origs chk example 1.0-1 +# 3.0 (quilt), single-debian-patch, one orig chk sunxi-tools 1.2-2.~~dgittest -echo xxx need more. +echo done.