git-debrebase: test suite: gdr-viagit: new test

Have verified with this:

  diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
  index 55fe4d74..20576c23 100755
  --- a/tests/tests/gdr-viagit
  +++ b/tests/tests/gdr-viagit
  @@ -17,6 +17,7 @@ git-debrebase)	;;
	  cat <<'END' >$st
   #!/bin/sh
   set -x
  +export GIT_DIR=$PWD/`git-rev-parse --git-dir`
   exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
   END
	  chmod +x $st

that this would indeed spot at least some problems.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/tests/control b/debian/tests/control
index 05ea2dbdd5d1fe9b9cf8a59cb94be086464274f8..b324377110d433f6c6521aa0b53a182da914320e 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,7 +16,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
 Restrictions: x-dgit-intree-only x-dgit-git-only
 

-Tests: gdr-edits gdr-import-dgit
+Tests: gdr-edits gdr-import-dgit gdr-viagit

 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime
 
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime
 

diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
new file mode 100755 (executable)
index 0000000..5f6e1d8
--- /dev/null
+++ b/tests/tests/gdr-viagit
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+
+t-setup-import gdr-convert-gbp
+
+: 'set up so t-git-debrebase runs gdr via git'
+
+case "$DGIT_GITDEBREBASE_TEST" in
+''|git-debrebase)      ;;
+*)
+       t-tstunt
+       st=$tmp/tstunt/git-debrebase
+       export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
+       cat <<'END' >$st
+#!/bin/sh
+set -x
+exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
+END
+       chmod +x $st
+       ;;
+esac
+
+DGIT_GITDEBREBASE_TEST='git debrebase'
+
+: 'do a simple test'
+
+cd $p
+
+t-some-changes
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch --prose=wombat
+t-gdr-good stitched
+
+t-ok