diff options
-rw-r--r-- | tests/lib-gdr | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index a13696d..6c74465 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -23,8 +23,6 @@ t-gdr-good () { git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches' - local etypes bwtip - LC_MESSAGES=C t-git-debrebase status >../status.check case $state in laundered) @@ -37,6 +35,15 @@ t-gdr-good () { ;; esac + t-gdr-good-analyse HEAD $state +} + +t-gdr-good-analyse () { + local head=$1 + local state=$2 + local wsfx=$3 + local etypes bwtip + # etypes is either a type, # or PseudoMerge-<more etypes> # or AddPatches-<more etypes> @@ -51,9 +58,9 @@ t-gdr-good () { pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;; esac - anal=../anal - t-git-debrebase analyse >$anal.check - expect=`git rev-parse HEAD` + anal=../anal$wsfx + t-git-debrebase analyse $head >$anal.check + expect=`git rev-parse $head` exec <$anal.check local cid ctype info nparents while read cid ctype info; do |