diff options
| author | Jean Delvare <jdelvare@suse.de> | 2017-05-09 16:54:48 +0200 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2017-05-09 16:54:48 +0200 |
| commit | 1d8867cd1fac531f576ad3a9a7eea4eef3ab8ed0 (patch) | |
| tree | 727c431232cd03769b62b58372b1c937e4275b1e /test/patch-wrapper.test | |
| parent | ce137ed78de177a92a867979cdea8aabc9e43a32 (diff) | |
| download | quilt-1d8867cd1fac531f576ad3a9a7eea4eef3ab8ed0.tar.gz | |
test: Consistently use %{P} and %{_P}
There is no point in defining P and _P in the Makefile to allow for
QUILT_PATCHES_PREFIX to be set or unset if we do not use these
variables consistently in the test suite. Replace hardcoded
"patches/" with %{P} or %{_P} throughout the test suite wherever
relevant so that unsetting QUILT_PATCHES_PREFIX in test.quiltrc
actually works.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Diffstat (limited to 'test/patch-wrapper.test')
| -rw-r--r-- | test/patch-wrapper.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/patch-wrapper.test b/test/patch-wrapper.test index 93fd50a..69b41d1 100644 --- a/test/patch-wrapper.test +++ b/test/patch-wrapper.test @@ -13,7 +13,7 @@ $ mv foo.orig foo $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -s -p0 < foo.diff $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -22,14 +22,14 @@ $ patch-wrapper --backup -B xxx/ -s -p0 < foo.diff $ find xxx -type f > xxx/foo $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > 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 +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -37,7 +37,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 < foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -46,7 +46,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 < somewhere/foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -54,7 +54,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 -i somewhere/foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -71,6 +71,6 @@ $ cat foo.orig > > 5b $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} |