From d2fa05117e4f4a91db3dd0c383eaffb4ffe1b080 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 22 Sep 2016 01:25:26 +0100 Subject: Test suite: quilt-splitbrains: Rename Signed-off-by: Ian Jackson --- tests/tests/quilt-splitbrains | 127 ++++++++++++++++++++++++++++++++++++++++++ tests/tests/quilt-unapplied | 127 ------------------------------------------ 2 files changed, 127 insertions(+), 127 deletions(-) create mode 100755 tests/tests/quilt-splitbrains delete mode 100755 tests/tests/quilt-unapplied (limited to 'tests') diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains new file mode 100755 index 0000000..2478465 --- /dev/null +++ b/tests/tests/quilt-splitbrains @@ -0,0 +1,127 @@ +#!/bin/bash +set -e +. tests/lib + +t-tstunt-parsechangelog + +t-newtag + +# Easiest way to make a patches-unapplied but not-gbp tree is +# to take the patches-unapplied tree and by-hand commit the .gitignore +# changes as a debian patch. +t-gbp-example-prep + +suite=sid + +want-success () { + local qmode=$1; shift + t-dgit "$@" --quilt=$qmode build-source + + t-refs-same-start + t-ref-head + t-dgit "$@" --quilt=$qmode push + t-$qmode-pushed-good +} + + +echo "===== testing tree suitable for --quilt=gbp (only) =====" + +t-expect-fail 'grep: new-upstream-file: No such file or directory' \ +t-dgit --quilt=dpm build-source + +t-expect-fail 'git tree differs from result of applying' \ +t-dgit -wgf --quilt=dpm build-source + +t-expect-fail 'git tree differs from orig in upstream files' \ +t-dgit -wgf --quilt=unapplied build-source + +t-expect-fail 'This might be a patches-unapplied branch' \ +t-dgit -wgf build-source + +# testing success with --quilt=gbp are done in quilt-gbp test case + + +echo "===== making tree suitable for --quilt=unapplied (only) =====" + +pf=debian/patches/test-gitignore + +cat >$pf < +Subject: Add .gitignore + +--- +END + +git-diff /dev/null .gitignore >>$pf || test $? = 1 +echo ${pf##*/} >>debian/patches/series + +git add debian/patches +git rm -f .gitignore +git commit -m 'Turn gitignore into a debian patch' +gitigncommit=`git rev-parse HEAD` + +t-commit unapplied 1.0-3 + +echo "----- testing tree suitable for --quilt=unapplied (only) -----" + +t-expect-fail 'git tree differs from result of applying' \ +t-dgit -wgf --quilt=dpm build-source + +t-expect-fail 'gitignores: but, such patches exist' \ +t-dgit -wgf --quilt=gbp build-source + +t-expect-fail 'This might be a patches-unapplied branch' \ +t-dgit -wgf build-source + +want-success unapplied -wgf + + +echo "===== making fully-applied tree suitable for --quilt-check =====" + +git checkout master +git merge --ff-only dgit/dgit/sid + +t-commit vanilla 1.0-4 + +echo "----- testing fully-applied tree suitable for --quilt-check -----" + +t-expect-fail 'gitignores: but, such patches exist' \ +t-dgit --quilt=dpm build-source + +t-expect-fail 'git tree differs from orig in upstream files' \ +t-dgit --quilt=gbp build-source + +t-expect-fail 'git tree differs from orig in upstream files' \ +t-dgit --quilt=unapplied build-source + +t-dgit --quilt=nofix build-source +t-refs-same-start +t-ref-head +t-dgit --quilt=nofix push +t-pushed-good-core + + +echo "===== making tree suitable for --quilt=dpm (only) =====" + +git checkout master +git merge --ff-only dgit/dgit/sid + +git revert --no-edit $gitigncommit + +t-commit dpmish 1.0-5 + +echo "----- testing tree suitable for --quilt=dpm (only) -----" + +t-expect-fail 'git tree differs from orig in upstream files' \ +t-dgit -wgf --quilt=gbp build-source + +t-expect-fail 'git tree differs from orig in upstream files' \ +t-dgit -wgf --quilt=unapplied build-source + +t-expect-fail 'This might be a patches-applied branch' \ +t-dgit -wgf build-source + +want-success dpm + + +echo ok. diff --git a/tests/tests/quilt-unapplied b/tests/tests/quilt-unapplied deleted file mode 100755 index 2478465..0000000 --- a/tests/tests/quilt-unapplied +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash -set -e -. tests/lib - -t-tstunt-parsechangelog - -t-newtag - -# Easiest way to make a patches-unapplied but not-gbp tree is -# to take the patches-unapplied tree and by-hand commit the .gitignore -# changes as a debian patch. -t-gbp-example-prep - -suite=sid - -want-success () { - local qmode=$1; shift - t-dgit "$@" --quilt=$qmode build-source - - t-refs-same-start - t-ref-head - t-dgit "$@" --quilt=$qmode push - t-$qmode-pushed-good -} - - -echo "===== testing tree suitable for --quilt=gbp (only) =====" - -t-expect-fail 'grep: new-upstream-file: No such file or directory' \ -t-dgit --quilt=dpm build-source - -t-expect-fail 'git tree differs from result of applying' \ -t-dgit -wgf --quilt=dpm build-source - -t-expect-fail 'git tree differs from orig in upstream files' \ -t-dgit -wgf --quilt=unapplied build-source - -t-expect-fail 'This might be a patches-unapplied branch' \ -t-dgit -wgf build-source - -# testing success with --quilt=gbp are done in quilt-gbp test case - - -echo "===== making tree suitable for --quilt=unapplied (only) =====" - -pf=debian/patches/test-gitignore - -cat >$pf < -Subject: Add .gitignore - ---- -END - -git-diff /dev/null .gitignore >>$pf || test $? = 1 -echo ${pf##*/} >>debian/patches/series - -git add debian/patches -git rm -f .gitignore -git commit -m 'Turn gitignore into a debian patch' -gitigncommit=`git rev-parse HEAD` - -t-commit unapplied 1.0-3 - -echo "----- testing tree suitable for --quilt=unapplied (only) -----" - -t-expect-fail 'git tree differs from result of applying' \ -t-dgit -wgf --quilt=dpm build-source - -t-expect-fail 'gitignores: but, such patches exist' \ -t-dgit -wgf --quilt=gbp build-source - -t-expect-fail 'This might be a patches-unapplied branch' \ -t-dgit -wgf build-source - -want-success unapplied -wgf - - -echo "===== making fully-applied tree suitable for --quilt-check =====" - -git checkout master -git merge --ff-only dgit/dgit/sid - -t-commit vanilla 1.0-4 - -echo "----- testing fully-applied tree suitable for --quilt-check -----" - -t-expect-fail 'gitignores: but, such patches exist' \ -t-dgit --quilt=dpm build-source - -t-expect-fail 'git tree differs from orig in upstream files' \ -t-dgit --quilt=gbp build-source - -t-expect-fail 'git tree differs from orig in upstream files' \ -t-dgit --quilt=unapplied build-source - -t-dgit --quilt=nofix build-source -t-refs-same-start -t-ref-head -t-dgit --quilt=nofix push -t-pushed-good-core - - -echo "===== making tree suitable for --quilt=dpm (only) =====" - -git checkout master -git merge --ff-only dgit/dgit/sid - -git revert --no-edit $gitigncommit - -t-commit dpmish 1.0-5 - -echo "----- testing tree suitable for --quilt=dpm (only) -----" - -t-expect-fail 'git tree differs from orig in upstream files' \ -t-dgit -wgf --quilt=gbp build-source - -t-expect-fail 'git tree differs from orig in upstream files' \ -t-dgit -wgf --quilt=unapplied build-source - -t-expect-fail 'This might be a patches-applied branch' \ -t-dgit -wgf build-source - -want-success dpm - - -echo ok. -- cgit v1.2.3