diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 12:21:55 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 12:21:55 +0100 |
| commit | 37caf544c8c2f8a69e673c2b2ec4fee885d53a0f (patch) | |
| tree | 833adff5b480f28efe55fb972f89473552770558 | |
| parent | 817b18a94707497d21c5a467bdd789e7b039f666 (diff) | |
test suite: gdr-edits: Rely on dgit interop, and test that it DTRT
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | tests/lib-gdr | 9 | ||||
| -rwxr-xr-x | tests/tests/gdr-edits | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 08717dd..9eb7537 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -47,6 +47,7 @@ t-gdr-good () { ;; stitched) etypes=Pseudomerge-Upstream ;; pushed) etypes=AddPatches-Pseudomerge-Upstream ;; + pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;; esac t-git-debrebase analyse >../anal.check @@ -68,6 +69,7 @@ t-gdr-good () { Packaging/SAME) ;; Packaging/Upstream) ;; AddPatches/SAME) ;; + AddPatches/AddPatchesInterop) ;; Changelog/Packaging) ;; Changelog/Upstream) ;; Upstream/SAME) ;; @@ -87,6 +89,13 @@ t-gdr-good () { fi esac + case "$cetype" in + AddPatchesInterop) + git log -n1 --pretty=format:%B \ + | grep '^\[git-debrebase[ :]' + ;; + esac + case "$ctype" in Pseudomerge) expect=${info#Contributor=} diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 45a3f20..a23c2f0 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -23,18 +23,15 @@ git tag t.before t-git-debrebase t-gdr-good laundered -t-git-debrebase stitch --prose=wombat -t-gdr-good stitched - t-dgit push-source -t-gdr-good pushed +t-gdr-good pushed-interop git branch before-noop t-git-next-date t-git-debrebase t-git-debrebase stitch -t-gdr-good pushed +t-gdr-good pushed-interop t-refs-same-start t-ref-same refs/heads/before-noop |