From d2a8f79a151407a01b1bf82bf84c44657a12c7ef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 20:44:53 +0000 Subject: 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 --- tests/tests/gdr-viagit | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 tests/tests/gdr-viagit (limited to 'tests/tests/gdr-viagit') diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit new file mode 100755 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 -- cgit v1.2.3 From f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:31:49 +0100 Subject: test suite: git-debrebase: provide GDR "macro" for dependencies Signed-off-by: Ian Jackson --- tests/tests/gdr-viagit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/tests/gdr-viagit') diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit index 5f6e1d8..454b02d 100755 --- a/tests/tests/gdr-viagit +++ b/tests/tests/gdr-viagit @@ -2,7 +2,7 @@ set -e . tests/lib -t-dependencies git-buildpackage libfile-fnmatch-perl faketime +t-dependencies GDR t-setup-import gdr-convert-gbp -- cgit v1.2.3 From 0979965eaf16aa08447be9ee4ddce293d0354154 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 22:12:39 +0100 Subject: test suite: git-debrebase: Use gdr-convert-gbp-noarchive Signed-off-by: Ian Jackson --- tests/tests/gdr-viagit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/tests/gdr-viagit') diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit index 454b02d..ef481b6 100755 --- a/tests/tests/gdr-viagit +++ b/tests/tests/gdr-viagit @@ -4,7 +4,7 @@ set -e t-dependencies GDR -t-setup-import gdr-convert-gbp +t-setup-import gdr-convert-gbp-noarchive : 'set up so t-git-debrebase runs gdr via git' -- cgit v1.2.3 From 13c1ffa10ca71511f1419372f07ef8c180b5aea4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:37:33 +0100 Subject: test suite: git-debrebase: Do some tests without dgit installed We provide a new psuedo-dependency NO-DGIT which throws away the usual default dependency list. We abolish NO-DEFAULT which could not be useful because the tests pretty much all depend on setup/gnupg which (currently, as a workaround for the gnupg2 races) requires chiark-utils-bin for with-lock-ex. There are two tests which don't actually need any interaction with the archive. Mark them accordingly. Signed-off-by: Ian Jackson --- tests/tests/gdr-viagit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/tests/gdr-viagit') diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit index ef481b6..644d2d4 100755 --- a/tests/tests/gdr-viagit +++ b/tests/tests/gdr-viagit @@ -2,7 +2,7 @@ set -e . tests/lib -t-dependencies GDR +t-dependencies NO-DGIT GDR t-setup-import gdr-convert-gbp-noarchive -- cgit v1.2.3