X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-unapplied;fp=tests%2Ftests%2Fquilt-unapplied;h=0000000000000000000000000000000000000000;hb=d2fa05117e4f4a91db3dd0c383eaffb4ffe1b080;hp=2478465a182818f9d90c7c22b30b4235a1e86198;hpb=97c1a1ffc16df83859231c2c38c9118c9c2caac0;p=dgit.git

diff --git a/tests/tests/quilt-unapplied b/tests/tests/quilt-unapplied
deleted file mode 100755
index 2478465a..00000000
--- 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 <<END
-From: Senatus <spqr@example.com>
-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.