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/symlink.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/symlink.test')
| -rw-r--r-- | test/symlink.test | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/symlink.test b/test/symlink.test index 342ec10..3b05cb4 100644 --- a/test/symlink.test +++ b/test/symlink.test @@ -3,14 +3,14 @@ # quilt should not remove symlinks to patch files $ echo foo > foo $ 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 $ echo "foo changed" > foo $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff # Setup a symlink $ mv patches/test.diff . @@ -21,7 +21,7 @@ # Test the refresh $ echo "foo changed 2" > foo $ quilt refresh --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -30,7 +30,7 @@ $ echo "foo changed 3" > foo $ touch -r patches/test.diff test.timeref $ quilt refresh --backup --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -58,7 +58,7 @@ # Test the header update $ quilt header -a < A test patch - > Appended text to header of patch patches/test.diff + > Appended text to header of patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -66,7 +66,7 @@ # Test the header update with a backup $ touch -r patches/test.diff test.timeref $ quilt header -r --backup - > Replaced header of patch patches/test.diff + > Replaced header of patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -96,7 +96,7 @@ $ chmod -w test.diff $ echo "foo changed 4" > foo $ quilt refresh --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff $ echo %{?} @@ -117,7 +117,7 @@ $ echo "foo changed 5" > foo $ quilt refresh --backup --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff $ echo %{?} |