summaryrefslogtreecommitdiffstats
path: root/test/sort.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/sort.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/sort.test')
-rw-r--r--test/sort.test22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/sort.test b/test/sort.test
index c3a66c4..41182f0 100644
--- a/test/sort.test
+++ b/test/sort.test
@@ -1,23 +1,23 @@
$ mkdir patches
$ quilt new sort.diff
- > Patch patches/sort.diff is now on top
+ > Patch %{P}sort.diff is now on top
$ quilt add b f
- > File b added to patch patches/sort.diff
- > File f added to patch patches/sort.diff
+ > File b added to patch %{P}sort.diff
+ > File f added to patch %{P}sort.diff
$ echo b > b
$ echo f > f
$ quilt refresh
- > Refreshed patch patches/sort.diff
+ > Refreshed patch %{P}sort.diff
$ quilt add c
- > File c added to patch patches/sort.diff
+ > File c added to patch %{P}sort.diff
$ echo c > c
$ quilt refresh
- > Refreshed patch patches/sort.diff
+ > Refreshed patch %{P}sort.diff
$ quilt files
> b
@@ -30,8 +30,8 @@
>~ Index: [^/]+/c
$ quilt add z x
- > File z added to patch patches/sort.diff
- > File x added to patch patches/sort.diff
+ > File z added to patch %{P}sort.diff
+ > File x added to patch %{P}sort.diff
$ echo z > z
$ echo x > x
@@ -50,7 +50,7 @@
>~ Index: [^/]+/z
$ quilt add a
- > File a added to patch patches/sort.diff
+ > File a added to patch %{P}sort.diff
$ echo a > a
$ quilt files
@@ -70,7 +70,7 @@
>~ Index: [^/]+/z
$ quilt refresh
- > Refreshed patch patches/sort.diff
+ > Refreshed patch %{P}sort.diff
$ grep '^Index' patches/sort.diff
>~ Index: [^/]+/b
@@ -89,7 +89,7 @@
>~ Index: [^/]+/z
$ quilt refresh --sort
- > Refreshed patch patches/sort.diff
+ > Refreshed patch %{P}sort.diff
$ grep '^Index' patches/sort.diff
>~ Index: [^/]+/a