7 # This test script tests each of the split brain quilt modes, and
8 # --quilt=linear, with a tree suitable for each of those, and pushes
9 # them in sequence. The idea is to check that each tree is rejected
10 # by the wrong quilt modes, and accepted and processed correctly by
13 t-tstunt-parsechangelog
17 # Easiest way to make a patches-unapplied but not-gbp tree is
18 # to take the patches-unapplied tree and by-hand commit the .gitignore
19 # changes as a debian patch.
29 t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
31 t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
36 echo "===== testing tree suitable for --quilt=gbp (only) ====="
38 t-expect-fail 'grep: new-upstream-file: No such file or directory' \
39 t-dgit --quilt=dpm build-source
41 t-expect-fail 'git tree differs from result of applying' \
42 t-dgit -wgf --quilt=dpm build-source
44 t-expect-fail 'git tree differs from orig in upstream files' \
45 t-dgit -wgf --quilt=unapplied build-source
47 t-expect-fail 'This might be a patches-unapplied branch' \
48 t-dgit -wgf build-source
50 # testing success with --quilt=gbp are done in quilt-gbp test case
53 echo "===== making tree suitable for --quilt=unapplied (only) ====="
55 pf=debian/patches/test-gitignore
58 From: Senatus <spqr@example.com>
59 Subject: Add .gitignore
64 git diff /dev/null .gitignore >>$pf || test $? = 1
65 echo ${pf##*/} >>debian/patches/series
67 git add debian/patches
69 git commit -m 'Turn gitignore into a debian patch'
70 gitigncommit=`git rev-parse HEAD`
72 t-commit unapplied 1.0-3
74 echo "----- testing tree suitable for --quilt=unapplied (only) -----"
76 t-expect-fail 'git tree differs from result of applying' \
77 t-dgit -wgf --quilt=dpm build-source
79 t-expect-fail 'gitignores: but, such patches exist' \
80 t-dgit -wgf --quilt=gbp build-source
82 t-expect-fail 'This might be a patches-unapplied branch' \
83 t-dgit -wgf build-source
85 want-success unapplied -wgf
88 echo "===== making fully-applied tree suitable for --quilt-check ====="
91 git merge --ff-only dgit/dgit/sid
93 t-commit vanilla 1.0-4
95 echo "----- testing fully-applied tree suitable for --quilt-check -----"
97 t-expect-fail 'gitignores: but, such patches exist' \
98 t-dgit --quilt=dpm build-source
100 t-expect-fail 'git tree differs from orig in upstream files' \
101 t-dgit --quilt=gbp build-source
103 t-expect-fail 'git tree differs from orig in upstream files' \
104 t-dgit --quilt=unapplied build-source
106 t-dgit --quilt=nofix build-source
109 t-dgit --quilt=nofix push
113 echo "===== making tree suitable for --quilt=dpm (only) ====="
116 git merge --ff-only dgit/dgit/sid
118 git revert --no-edit $gitigncommit
120 t-commit dpmish 1.0-5
122 echo "----- testing tree suitable for --quilt=dpm (only) -----"
124 t-expect-fail 'git tree differs from orig in upstream files' \
125 t-dgit -wgf --quilt=gbp build-source
127 t-expect-fail 'git tree differs from orig in upstream files' \
128 t-dgit -wgf --quilt=unapplied build-source
130 t-expect-fail 'This might be a patches-applied branch' \
131 t-dgit -wgf build-source
136 t-commit dpmish-stable 1.0-6 $suite
138 want-success dpm --new