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/setup.test | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'test/setup.test')

diff --git a/test/setup.test b/test/setup.test
index 69725ec..690008e 100644
--- a/test/setup.test
+++ b/test/setup.test
@@ -26,10 +26,10 @@ $ ls -l patches series | sed -e 's:.* -> ::'
 > ..
 > ../series
 $ quilt push -qa
-> Applying patch patches/foo.diff
-> Applying patch patches/revert.diff
-> Applying patch patches/again.diff
-> Now at patch patches/again.diff
+> Applying patch %{P}foo.diff
+> Applying patch %{P}revert.diff
+> Applying patch %{P}again.diff
+> Now at patch %{P}again.diff
 $ cd ..
 $ rm -rf dir
 
@@ -46,10 +46,10 @@ $ ls -l patches series | sed -e 's:.* -> ::'
 > ../..
 > ../../series
 $ quilt push -qa
-> Applying patch patches/foo.diff
-> Applying patch patches/revert.diff
-> Applying patch patches/again.diff
-> Now at patch patches/again.diff
+> Applying patch %{P}foo.diff
+> Applying patch %{P}revert.diff
+> Applying patch %{P}again.diff
+> Now at patch %{P}again.diff
 $ cd ../..
 $ rm -rf other
 $ mkdir dir1
@@ -64,10 +64,10 @@ $ ls -l patches series | sed -e 's:.* -> ::'
 > ../..
 > ../../dir1/series
 $ quilt push -qa
-> Applying patch patches/foo.diff
-> Applying patch patches/revert.diff
-> Applying patch patches/again.diff
-> Now at patch patches/again.diff
+> Applying patch %{P}foo.diff
+> Applying patch %{P}revert.diff
+> Applying patch %{P}again.diff
+> Now at patch %{P}again.diff
 $ cd ../..
 $ rm -rf "dir"
 
@@ -122,9 +122,9 @@ $ ls -l patches series | sed -e 's:.* -> ::'
 > ..
 > ../series
 $ quilt push -qa
-> Applying patch patches/foo.diff
-> Applying patch patches/revert.diff
-> Applying patch patches/again.diff
-> Now at patch patches/again.diff
+> Applying patch %{P}foo.diff
+> Applying patch %{P}revert.diff
+> Applying patch %{P}again.diff
+> Now at patch %{P}again.diff
 $ cd ..
 $ rm -rf "space [dir]"
-- 
cgit