From 1951e44b06b3e179b508bcd139d8758c250e35e2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 16 Jun 2018 23:17:34 +0100 Subject: [PATCH] git-debrebase: test suite: gdr-subcommands: honour new $xopts This allows the introduction of chaining checkletters which modify subsequent attempts. Signed-off-by: Ian Jackson --- tests/tests/gdr-subcommands | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands index d9883210..123a0d9f 100755 --- a/tests/tests/gdr-subcommands +++ b/tests/tests/gdr-subcommands @@ -63,22 +63,24 @@ subcmd () { before=before-$work git branch $before + local xopts='' + 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" \ - t-git-debrebase $subcmd + t-git-debrebase $xopts $subcmd continue ;; *) - t-git-debrebase $subcmd + t-git-debrebase $xopts $subcmd ;; esac -- 2.30.2