[Quilt-dev] [PATCH 2/4] test: Drop incorrect uses of %{P}

[Jean Delvare]

%{P} only makes sense when checking the output of a quilt command.
The value of QUILT_PATCHES_PREFIX can obviously not affect what the
user is writing on the command line, nor the output of other
commands.

Signed-off-by: Jean Delvare <address@hidden>
---
 test/delete.test     |    4 ++--
 test/example1.test   |    2 +-
 test/failbackup.test |    2 +-
 test/import.test     |    4 ++--
 test/import2.test    |    4 ++--
 test/three.test      |    6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

--- quilt.orig/test/delete.test 2017-05-02 09:54:24.222897256 +0200
+++ quilt/test/delete.test      2017-05-02 09:54:32.554983145 +0200
@@ -62,14 +62,14 @@ Test the delete command.
 
        $ quilt series
 
-       $ echo "test1" > %{P}series
+       $ echo "test1" > patches/series
        $ quilt delete -n
        > Removed patch %{P}test1
 
        $ quilt series
 
        # Force the pop operaton to fail
-       $ echo "test3" > %{P}series
+       $ echo "test3" > patches/series
        $ echo "test3" > .pc/applied-patches
        $ mkdir -p .pc/test3/dir
        $ touch .pc/test3/dir/file
--- quilt.orig/test/example1.test       2017-05-02 09:54:24.222897256 +0200
+++ quilt/test/example1.test    2017-05-02 10:00:11.583480501 +0200
@@ -88,7 +88,7 @@ Or ``quilt edit Oberon.txt''
        >
        > No patches applied
 
-       $ quilt files %{P}flower.diff
+       $ quilt files patches/flower.diff
        > Oberon.txt
 
        $ sed -e "s/girls/maidens/" Oberon.txt > Oberon.new
--- quilt.orig/test/failbackup.test     2017-05-02 10:00:11.583480501 +0200
+++ quilt/test/failbackup.test  2017-05-02 10:00:39.860772380 +0200
@@ -16,7 +16,7 @@ What happens when refresh fails because
        $ cat > test.txt
        < This is updated test.txt.
        $ quilt refresh --backup
-       >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: 
Permission denied
+       >~ mv: cannot move [`']?patches/test.diff'? to 
[`']?patches/test.diff~'?: Permission denied
        $ echo %{?}
        > 1
 
--- quilt.orig/test/import.test 2017-05-02 09:54:24.251897555 +0200
+++ quilt/test/import.test      2017-05-02 10:00:12.399488923 +0200
@@ -84,7 +84,7 @@
        $ quilt delete patch1
        > Removed patch patches/patch1.diff
 
-       $ cat %{P}series
+       $ cat patches/series
        > patch2.diff
 
        # test a few error cases
@@ -149,7 +149,7 @@
        > patch2.diff
        > series
 
-       $ cat %{P}series
+       $ cat patches/series
        > patch1.patch
        > patch2.diff
 
--- quilt.orig/test/import2.test        2017-05-02 09:54:24.222897256 +0200
+++ quilt/test/import2.test     2017-05-02 09:54:32.554983145 +0200
@@ -65,7 +65,7 @@
        $ quilt delete patch1
        > Removed patch %{P}patch1.diff.gz
 
-       $ cat %{P}series
+       $ cat patches/series
        > patch2.diff.gz
 
        # test a few error cases
@@ -130,7 +130,7 @@
        > patch2.diff.gz
        > series
 
-       $ cat %{P}series
+       $ cat patches/series
        > patch1.patch.gz
        > patch2.diff.gz
 
--- quilt.orig/test/three.test  2017-05-02 09:54:24.222897256 +0200
+++ quilt/test/three.test       2017-05-02 10:00:11.583480501 +0200
@@ -44,7 +44,7 @@
 
        $ echo f > f
 
-       $ ls %{P}
+       $ ls patches/
        > series
 
        $ quilt new patch2.diff
@@ -85,7 +85,7 @@
        >
        > Now at patch patches/patch1.diff
 
-       $ ls %{P}
+       $ ls patches/
        > patch2.diff
        > series
 
@@ -175,7 +175,7 @@
        $ quilt diff -P patch1 --combine patch2
        > Patch patches/patch2.diff not applied before patch patches/patch1.diff
 
-       $ echo patch3.diff >> %{P}series
+       $ echo patch3.diff >> patches/series
        $ quilt diff -P patch1 --combine patch3
        > Patch patches/patch3.diff is not applied
 

-- 
Jean Delvare
SUSE L3 Support