summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 19:14:01 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-26 01:07:27 +0100
commit6a110edce1bf7bb9f46b0410430c5f01a1ecc5c2 (patch)
tree90a1046b60ef76f16aa329e990d564ce902a146c /debian
parent166a9cf1edb3563eb399a8d3da26831dc69bfaed (diff)
test suite: gdr-fresh: Drop use of git-deborig and fix dependencies
b765388a4cea "test suite: Test dgit calling git-debrebase on new debianisation" failed to update the test dependencies, and does not work in a formal autopkgtest run because dgit is not installed. Additionally, Because scripts in devscripts have their own individual dependencies, and the dependencies for git-deborig differ between stretch and sid, It is not reasonably possible to write a dependency which allows git-deborig to work. This is another reason why this test does not work in a formal run (this time, failing only on sid/buster). So, drop use of git-deborig, and the resulting dependency on devscripts. (dgit and git-debrebase pull in devscripts anyway, so that is academic.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
-rw-r--r--debian/tests/control6
1 files changed, 1 insertions, 5 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 3051e87..51e00f4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,15 +16,11 @@ Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
Restrictions: x-dgit-intree-only x-dgit-git-only
-Tests: gdr-fresh
-Tests-Directory: tests/tests
-Depends: chiark-utils-bin, devscripts, git-debrebase, git-buildpackage, faketime
-
Tests: gdr-merge-conflicts
Tests-Directory: tests/tests
Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime