summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 20:21:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 23:05:47 +0100
commit3a434e0ecac4387bb900a078b7d65c751b99f3bb (patch)
tree2837251b9c43e42890c61651d009fcbb4dd75844
parent305822addb2da1b3742cfabdfa71be50c39c48c1 (diff)
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 <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/tests/control2
-rwxr-xr-xtests/tests/import-nonnative (renamed from tests/tests/import-quilt)14
2 files changed, 10 insertions, 6 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 1139029..4b0afe6 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
index 08ea866..98076f0 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.