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/nolink.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/nolink.test')
| -rw-r--r-- | test/nolink.test | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/nolink.test b/test/nolink.test index 5ac9473..47b8d51 100644 --- a/test/nolink.test +++ b/test/nolink.test @@ -7,10 +7,10 @@ > 2 $ quilt new test.diff - > Patch patches/test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add foo - > File foo added to patch patches/test.diff + > File foo added to patch %{P}test.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -20,13 +20,13 @@ $ echo "foo changed" > foo $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ quilt new test2.diff - > Patch patches/test2.diff is now on top + > Patch %{P}test2.diff is now on top $ quilt add foo - > File foo added to patch patches/test2.diff + > File foo added to patch %{P}test2.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -36,11 +36,11 @@ $ echo "foo changed again" > foo $ quilt refresh - > Refreshed patch patches/test2.diff + > Refreshed patch %{P}test2.diff $ quilt pop -q - > Removing patch patches/test2.diff - > Now at patch patches/test.diff + > Removing patch %{P}test2.diff + > Now at patch %{P}test.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -49,7 +49,7 @@ > 2 $ quilt pop -q - > Removing patch patches/test.diff + > Removing patch %{P}test.diff > No patches applied $ ls -l foo | awk '{ print $2 }' @@ -58,18 +58,18 @@ # quilt revert should not create hard links $ echo bar > bar $ quilt push -q - > Applying patch patches/test.diff - > Now at patch patches/test.diff + > Applying patch %{P}test.diff + > Now at patch %{P}test.diff $ quilt add bar - > File bar added to patch patches/test.diff + > File bar added to patch %{P}test.diff $ echo "bar changed" > bar $ quilt revert bar - > Changes to bar in patch patches/test.diff reverted + > Changes to bar in patch %{P}test.diff reverted $ ls -l bar | awk '{ print $2 }' > 1 $ quilt pop -q - > Removing patch patches/test.diff + > Removing patch %{P}test.diff > No patches applied |