chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: quilt-splitbrains: Drop non-wgf dpm test of gbp package
[dgit.git]
/
tests
/
tests
/
gdr-subcommands
diff --git
a/tests/tests/gdr-subcommands
b/tests/tests/gdr-subcommands
index 9d50b6c04f7db9134b4752ae1565854577be6bcc..e59fc07aaeab6ada1e0a510e3be9ff8b3027d299 100755
(executable)
--- a/
tests/tests/gdr-subcommands
+++ b/
tests/tests/gdr-subcommands
@@
-2,7
+2,7
@@
set -e
. tests/lib
set -e
. tests/lib
-t-dependencies
git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies
GDR
t-setup-import gdr-convert-gbp
t-setup-import gdr-convert-gbp
@@
-16,7
+16,8
@@
mix-it () {
local m=$(git symbolic-ref HEAD)
t-some-changes "subcommands $m 1"
local m=$(git symbolic-ref HEAD)
t-some-changes "subcommands $m 1"
- t-dgit -wgf quilt-fixup
+ # we want patches mde by dgit, not gdr, for our test cases
+ t-dgit --git-debrebase=true -wgf quilt-fixup
t-git-next-date
t-some-changes "subcommands $m 2"
t-git-next-date
t-some-changes "subcommands $m 2"
@@
-63,22
+64,40
@@
subcmd () {
before=before-$work
git branch $before
before=before-$work
git branch $before
+ local xopts=''
+
case "$checkletters" in
XX*)
fail "$checkletters" # for debugging
;;
case "$checkletters" in
XX*)
fail "$checkletters" # for debugging
;;
+ esac
+
+ case "$checkletters" in
+ X*)
+ t-expect-fail E:'snags: [0-9]* blockers' \
+ t-git-debrebase $xopts $subcmd
+ xopts+=' --force'
+ next_checkletter
+ ;;
+ esac
+
+ case "$checkletters" in
N*)
t-expect-fail E:. \
N*)
t-expect-fail E:. \
- t-git-debrebase $subcmd
- t-git-debrebase --noop-ok $subcmd
+ t-git-debrebase $xopts $subcmd
+ xopts+=' --noop-ok'
+ next_checkletter
;;
;;
+ esac
+
+ case "$checkletters" in
[EF]:*)
t-expect-fail "$checkletters" \
[EF]:*)
t-expect-fail "$checkletters" \
- t-git-debrebase $subcmd
+ t-git-debrebase $
xopts $
subcmd
continue
;;
*)
continue
;;
*)
- t-git-debrebase $subcmd
+ t-git-debrebase $
xopts $
subcmd
;;
esac
;;
esac
@@
-182,6
+201,9
@@
subcmd make-patches sPft "$Ep" uPft "$Ep"
# E:$pat } this is an error (must come first)
# F:$pat } arg is passed to expect-fail
#
# E:$pat } this is an error (must come first)
# F:$pat } arg is passed to expect-fail
#
+# X should fail due to snags, but succeed when forced
+# XX crash out of script for manual debugging
+#
# N this is a noop, error unless --noop-ok
# n this is a silent noop
# both of these imply tf; but, specify also one of u s
# N this is a noop, error unless --noop-ok
# n this is a silent noop
# both of these imply tf; but, specify also one of u s