From 1d8867cd1fac531f576ad3a9a7eea4eef3ab8ed0 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Tue, 9 May 2017 16:54:48 +0200
Subject: 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>
---
 test/patch-wrapper.test | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/patch-wrapper.test')

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}
-- 
cgit