summaryrefslogtreecommitdiffstats
path: root/test/setup.test
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2017-05-09 16:54:48 +0200
committerJean Delvare <jdelvare@suse.de>2017-05-09 16:54:48 +0200
commit1d8867cd1fac531f576ad3a9a7eea4eef3ab8ed0 (patch)
tree727c431232cd03769b62b58372b1c937e4275b1e /test/setup.test
parentce137ed78de177a92a867979cdea8aabc9e43a32 (diff)
downloadquilt-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/setup.test')
-rw-r--r--test/setup.test32
1 files changed, 16 insertions, 16 deletions
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]"