[Quilt-dev] [PATCH 4/4] test: Handle alternative QUILT_PATCHES values

[Jean Delvare]

When using an alternative QUILT_PATCHES value, we can't use %{P} in
the test case, because P is set in the Makefile before the test case
has a chance to redefine QUILT_PATCHES. Instead we have to make the
prefix optional in the output of the quilt commands, so that the test
will succeed regardless of QUILT_PATCHES_PREFIX being set or not.

Signed-off-by: Jean Delvare <address@hidden>
---
 test/project-settings.test   |    4 ++--
 test/remember-locations.test |    8 ++++----
 test/setup.test              |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

--- quilt.orig/test/project-settings.test       2017-05-02 10:27:02.721755676 
+0200
+++ quilt/test/project-settings.test    2017-05-02 10:27:11.935854817 +0200
@@ -16,7 +16,7 @@ $ cat > quilt_patches/create.patch
 < +new line
 
 $ quilt push
-> Applying patch quilt_patches/create.patch
+>~ Applying patch (quilt_patches/)?create.patch
 > patching file file
 >
-> Now at patch quilt_patches/create.patch
+>~ Now at patch (quilt_patches/)?create.patch
--- quilt.orig/test/remember-locations.test     2017-05-02 10:27:02.721755676 
+0200
+++ quilt/test/remember-locations.test  2017-05-02 10:27:11.935854817 +0200
@@ -3,7 +3,7 @@
        $ export QUILT_PATCHES=my/changes
        $ export QUILT_SERIES=patchlist
        $ quilt new mychange1
-       > Patch my/changes/mychange1 is now on top
+       >~ Patch (my/changes/)?mychange1 is now on top
        $ unset QUILT_PATCHES
        $ unset QUILT_SERIES
        $ cat .pc/.quilt_patches
@@ -16,12 +16,12 @@
        # Verify that the custom location is still used even
        # if QUILT_PATCHES is not set
        $ quilt new mychange2
-       > Patch my/changes/mychange2 is now on top
+       >~ Patch (my/changes/)?mychange2 is now on top
        # Verify that the root directory can be identified even
        # without QUILT_PATCHES with the .pc directory
        $ cd my
        $ quilt applied
-       > ../my/changes/mychange1
-       > ../my/changes/mychange2
+       >~ (../my/changes/)?mychange1
+       >~ (../my/changes/)?mychange2
 
        $ cd ..
--- quilt.orig/test/setup.test  2017-05-02 10:27:10.849843134 +0200
+++ quilt/test/setup.test       2017-05-02 10:27:11.935854817 +0200
@@ -91,8 +91,8 @@ $ ls -l quilt_patches quilt_series | sed
 > ..
 > ../series_with_patches
 $ quilt push -qa
-> Applying patch quilt_patches/foo.diff
-> Now at patch quilt_patches/foo.diff
+>~ Applying patch (quilt_patches/)?foo.diff
+>~ Now at patch (quilt_patches/)?foo.diff
 $ cd ..
 $ rm -rf "dir"
 

-- 
Jean Delvare
SUSE L3 Support