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/revert.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/revert.test')
| -rw-r--r-- | test/revert.test | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/revert.test b/test/revert.test index 02d0c6c..d86dcd6 100644 --- a/test/revert.test +++ b/test/revert.test @@ -4,16 +4,16 @@ $ echo f1 > sub/f $ echo g1 > sub/g $ quilt new p.diff - > Patch patches/p.diff is now on top + > Patch %{P}p.diff is now on top $ quilt add sub/f sub/g sub/h - > File sub/f added to patch patches/p.diff - > File sub/g added to patch patches/p.diff - > File sub/h added to patch patches/p.diff + > File sub/f added to patch %{P}p.diff + > File sub/g added to patch %{P}p.diff + > File sub/h added to patch %{P}p.diff $ echo h1 > sub/h $ quilt revert sub/h - > Changes to sub/h in patch patches/p.diff reverted + > Changes to sub/h in patch %{P}p.diff reverted $ quilt diff -z @@ -22,16 +22,16 @@ $ rm -f sub/g $ echo h2 > sub/h $ quilt refresh - > Refreshed patch patches/p.diff + > Refreshed patch %{P}p.diff # Check if we can revert modifications $ cd sub $ echo f3 > f $ echo h3 > h $ quilt revert f g h - > Changes to sub/f in patch ../patches/p.diff reverted + > Changes to sub/f in patch %{_P}p.diff reverted > File sub/g is unchanged - > Changes to sub/h in patch ../patches/p.diff reverted + > Changes to sub/h in patch %{_P}p.diff reverted $ quilt diff -z @@ -39,7 +39,7 @@ $ echo g3 > g $ quilt revert f g > File sub/f is unchanged - > Changes to sub/g in patch ../patches/p.diff reverted + > Changes to sub/g in patch %{_P}p.diff reverted $ quilt diff -z $ [ ! -e g ] || echo "File sub/g shouldn't exist" @@ -47,8 +47,8 @@ # Check if we can revert file deletion $ rm f h $ quilt revert f h - > Changes to sub/f in patch ../patches/p.diff reverted - > Changes to sub/h in patch ../patches/p.diff reverted + > Changes to sub/f in patch %{_P}p.diff reverted + > Changes to sub/h in patch %{_P}p.diff reverted $ quilt diff -z $ [ -e f ] || echo "File sub/f should exist" |