test suite: lib-gdr: t-gdr-good: Introduce $anal

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 849e3f642d5e6ae3385efab70c71421122f513c6..a13696d7581b9543628530cdc9fce7abea7076cd 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -51,9 +51,10 @@ t-gdr-good () {
        pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
        esac
 
        pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
        esac
 

-       t-git-debrebase analyse >../anal.check
+       anal=../anal
+       t-git-debrebase analyse >$anal.check

        expect=`git rev-parse HEAD`
        expect=`git rev-parse HEAD`

-       exec <../anal.check
+       exec <$anal.check

        local cid ctype info nparents
        while read cid ctype info; do
                : ===== $cid $ctype $info =====
        local cid ctype info nparents
        while read cid ctype info; do
                : ===== $cid $ctype $info =====


@@ -108,9 +109,9 @@ t-gdr-good () {
                        : 'reject pointless pseudomerges'
                        local overwritten=${parents/$expect/}
                        overwritten=${overwritten// /}
                        : 'reject pointless pseudomerges'
                        local overwritten=${parents/$expect/}
                        overwritten=${overwritten// /}

-                       t-git-debrebase analyse $overwritten >../anal.overwr
+                       t-git-debrebase analyse $overwritten >$anal.overwr

                        local ocid otype oinfo
                        local ocid otype oinfo

-                       read <../anal.overwr ocid otype oinfo
+                       read <$anal.overwr ocid otype oinfo

                        case "$otype" in
                        Pseudomerge) test "x$info" != "x$oinfo" ;;
                        esac
                        case "$otype" in
                        Pseudomerge) test "x$info" != "x$oinfo" ;;
                        esac