diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-10 18:52:13 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-10 20:54:30 +0000 |
| commit | 317215a97a4ec01422c96675c24df864d29a7595 (patch) | |
| tree | 3fb7c1f114314e0980bec93372fbcded1b6cce7c /tests | |
| parent | 44121bd00b59a97b6f32ab2f205d263658d274fa (diff) | |
dgit: Do not use gdr to make patches with unmarked breakwater start
We must also adjust the gdr-fresh test case: now its patches are made
by dgit, not gdr. We now check that they are correct (that is, that
dgit is now happy with things) but not what they look like).
Several other test cases test the dgit gdr makepatches functionality,
calling t-gdr-made-patches (via t-gdr-good, for example). (I have
verified that changing the remaining "return 1" from branch_is_gdr to
"return 0" does cause many test failures.)
Closes: #1015779
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-fresh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/tests/gdr-fresh b/tests/tests/gdr-fresh index 169181c..642aacc 100755 --- a/tests/tests/gdr-fresh +++ b/tests/tests/gdr-fresh @@ -25,21 +25,22 @@ git commit -m 'initial debianisation' t-make-orig example 1.0 -dgit-quilt-fixup-uses-gdr () { +dgit-quilt-fixup-uses-dgit-linear () { t-git-next-date DGIT_TEST_DEBUG=-DD t-dgit quilt-fixup 2>&1 |tee ../fixup.out - grep '^branch_is_gdr .* YES$' ../fixup.out + grep '^branch_is_gdr .* unmarked BreakwaterStart NO$' ../fixup.out + + t-dgit --quilt=nofix quilt-fixup } -dgit-quilt-fixup-uses-gdr +dgit-quilt-fixup-uses-dgit-linear git checkout --detach patch-queue/quilt-tip git rebase master git push . HEAD:master git checkout master -dgit-quilt-fixup-uses-gdr -t-gdr-made-patches +dgit-quilt-fixup-uses-dgit-linear t-ok |