diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 12:00:57 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | b2961d4e30d201c4a22e7a8659696a7dcb2e2e81 (patch) | |
| tree | dfe8412090356515e51b3bd97e7f7df0ab9c6b01 /tests | |
| parent | 7ec74423668f93db5107faaae4314f79a2d9d2f0 (diff) | |
git-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 74c571a..d6d33f7 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -44,27 +44,40 @@ t-gdr-good () { enparents=1 : "$ctype/$cetype" "$parents" case "$ctype/$cetype" in - Pseudomerge/SAME) + Pseudomerge/SAME) ;; + Packaging/SAME) ;; + Packaging/Upstream) ;; + AddPatches/SAME) ;; + Changelog/Packaging) ;; + Changelog/Upstream) ;; + Upstream/SAME) ;; + BreakwaterUpstreamMerge/Upstream) ;; + BreakwaterUpstreamMerge/Packaging) ;; + *) + fail "etype=$etype ctype=$ctype cetype=$cetype $cid" + ;; + esac + + case "$ctype" in + Pseudomerge) expect=${info#Contributor=} expect=${expect%% *} enparents=2 git diff --quiet $expect..$cid etype=Upstream ;; - Packaging/SAME|\ - Packaging/Upstream) + Packaging) git diff --quiet $expect..$cid -- ':.' ':!debian' git diff --quiet $expect..$cid -- ':debian/patches' etype=Packaging ;; - AddPatches/SAME) + AddPatches) git diff --quiet $expect..$cid -- \ ':.' ':!debian/patches' etype=$netype netype=Upstream ;; - Changelog/Packaging|\ - Changelog/Upstream) + Changelog) git diff --quiet $expect..$cid -- \ ':.' ':!debian/changelog' etype=Packaging @@ -72,13 +85,9 @@ t-gdr-good () { Upstream/SAME) git diff --quiet $expect..$cid -- ':debian' ;; - BreakwaterUpstreamMerge/Upstream| \ - BreakwaterUpstreamMerge/Packaging) + BreakwaterUpstreamMerge) break ;; - *) - fail "etype=$etype ctype=$ctype cetype=$cetype $cid" - ;; esac local cnparents=`printf "%s" "$parents" | wc -w` |