summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/project-settings.test4
-rw-r--r--test/remember-locations.test8
-rw-r--r--test/setup.test4
3 files changed, 8 insertions, 8 deletions
diff --git a/test/project-settings.test b/test/project-settings.test
index 744342d..0f6ba3f 100644
--- a/test/project-settings.test
+++ b/test/project-settings.test
@@ -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
diff --git a/test/remember-locations.test b/test/remember-locations.test
index 65e62f7..4e30c27 100644
--- a/test/remember-locations.test
+++ b/test/remember-locations.test
@@ -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 ..
diff --git a/test/setup.test b/test/setup.test
index 690008e..32b02ba 100644
--- a/test/setup.test
+++ b/test/setup.test
@@ -91,8 +91,8 @@ $ ls -l quilt_patches quilt_series | sed -e 's:.* -> ::'
> ..
> ../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"