git-debrebase: test suite: gdr-subcommands: honour new $xopts

[dgit.git] / tests / tests / gdr-subcommands

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 9d50b6c04f7db9134b4752ae1565854577be6bcc..123a0d9f5f20a997559977a43b5380ed17bd5657 100755 (executable)
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -63,22 +63,24 @@ subcmd () {
                before=before-$work
                git branch $before
 
                before=before-$work
                git branch $before
 

+               local xopts=''
+

                case "$checkletters" in
                XX*)
                        fail "$checkletters" # for debugging
                        ;;
                N*)
                        t-expect-fail E:. \
                case "$checkletters" in
                XX*)
                        fail "$checkletters" # for debugging
                        ;;
                N*)
                        t-expect-fail E:. \

-                       t-git-debrebase $subcmd
-                       t-git-debrebase --noop-ok $subcmd
+                       t-git-debrebase $xopts $subcmd
+                       t-git-debrebase $xopts --noop-ok $subcmd

                        ;;
                [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 +184,8 @@ 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
 #

+#   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