summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-25 17:35:53 +0200
committerJean Delvare <jdelvare@suse.de>2014-04-25 17:35:53 +0200
commit3782288bc57498fb0ce6da1978338b0f3d8dd6ae (patch)
treefc2d03c118ef13976b0fc08b0e51212f2c2aca22
parentde85d19348f29c06c35af5b412aaa04a6494386a (diff)
downloadquilt-3782288bc57498fb0ce6da1978338b0f3d8dd6ae.tar.gz
test: Make patch-wrapper.test safer
Create directory "patches" so that quilt commands get the right root even if patch-wrapper fails.
-rw-r--r--test/patch-wrapper.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/patch-wrapper.test b/test/patch-wrapper.test
index 48678dd..93fd50a 100644
--- a/test/patch-wrapper.test
+++ b/test/patch-wrapper.test
@@ -10,12 +10,14 @@ $ sed -e 's/3/3a/' foo.orig > foo
$ diff -u foo.orig foo > foo.diff
$ mv foo.orig foo
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -s -p0 < foo.diff
$ quilt pop -q
> Removing patch patches/foo.diff
> No patches applied
$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper --backup -B xxx/ -s -p0 < foo.diff
$ find xxx -type f
> xxx/foo
@@ -24,12 +26,14 @@ $ quilt pop -q
> No patches applied
$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -s -p0 -i foo.diff
$ quilt pop -q
> Removing patch patches/foo.diff
> No patches applied
$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -p0 < foo.diff
> patching file foo
$ quilt pop -q
@@ -38,6 +42,7 @@ $ quilt pop -q
$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
$ mv foo.diff somewhere/
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -p0 < somewhere/foo.diff
> patching file foo
$ quilt pop -q
@@ -45,6 +50,7 @@ $ quilt pop -q
> No patches applied
$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -p0 -i somewhere/foo.diff
> patching file foo
$ quilt pop -q
@@ -54,6 +60,7 @@ $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
$ sed -e 's/5/5b/' foo > foo.new
$ mv foo.new foo
+$ mkdir ${QUILT_PATCHES:-patches}
$ patch-wrapper -p0 < somewhere/foo.diff
> patching file foo
> Hunk #1 succeeded at 1 with fuzz 1.