- Some more QUILT_PATCHES_PREFIX fixes.

5 files changed, 39 insertions, 38 deletions

diff --git a/test/Makefile b/test/Makefile
index 86a3031..ca75741 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,6 +3,7 @@ TESTS=$(shell ls -tr *.test)
 export QUILTRC=$(CURDIR)/test.quiltrc
 ifneq ($(shell source $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
 export P=patches/
+export _P=../patches/
 endif
 $(warning P=$(P))
 
diff --git a/test/new-nosubdir.test b/test/new-nosubdir.test
index ab3f854..176cfcf 100644
--- a/test/new-nosubdir.test
+++ b/test/new-nosubdir.test
@@ -5,7 +5,7 @@
 	$ cd sub
 	$ quilt new here.diff
 	> Warning: directory ../patches exists; ignoring
-	> Patch %{P}here.diff is now on top
+	> Patch %{_P}here.diff is now on top
 
 	$ cd ../..
 	$ rm -rf d
diff --git a/test/snapshot2.test b/test/snapshot2.test
index 238d8c5..a0ea9e4 100644
--- a/test/snapshot2.test
+++ b/test/snapshot2.test
@@ -5,26 +5,26 @@
 
 	$ cd d
 	$ quilt add f.txt
-	> File d/f.txt added to patch %{P}snapshot
+	> File d/f.txt added to patch %{_P}snapshot
 	$ cat > f.txt
 	< f.txt
 
 	$ quilt add g.txt
-	> File d/g.txt added to patch %{P}snapshot
+	> File d/g.txt added to patch %{_P}snapshot
 	$ cat > g.txt
 	< g.txt
 
 	$ quilt refresh
-	> Refreshed patch %{P}snapshot
+	> Refreshed patch %{_P}snapshot
 	$ quilt snapshot
 	$ quilt fork
-	> Fork of patch %{P}snapshot created as %{P}snapshot-2
+	> Fork of patch %{_P}snapshot created as %{_P}snapshot-2
 
 	$ quilt remove g.txt
-	> File d/g.txt removed from patch %{P}snapshot-2
+	> File d/g.txt removed from patch %{_P}snapshot-2
 
 	$ quilt add h.txt
-	> File d/h.txt added to patch %{P}snapshot-2
+	> File d/h.txt added to patch %{_P}snapshot-2
 
 	$ cat > h.txt
 	< h.txt
@@ -33,7 +33,7 @@
 	< more changes
 
 	$ quilt refresh
-	> Refreshed patch %{P}snapshot-2
+	> Refreshed patch %{_P}snapshot-2
 
 	$ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)"
 	> Index: d/d/f.txt
diff --git a/test/subdir.test b/test/subdir.test
index 46ac36e..118b775 100644
--- a/test/subdir.test
+++ b/test/subdir.test
@@ -21,7 +21,7 @@
 
 	$ cd subdir
 	$ quilt add file2
-	> File subdir/file2 added to patch %{P}test.patch
+	> File subdir/file2 added to patch %{_P}test.patch
 
 	$ cat > file2
 	< another file
@@ -30,7 +30,7 @@
 	< yet another file
 
 	$ quilt add file3
-	> File subdir/file3 added to patch %{P}test.patch
+	> File subdir/file3 added to patch %{_P}test.patch
 
 	$ rm file3
 	$ quilt files
@@ -60,10 +60,10 @@
 	> -yet another file
 
 	$ quilt refresh
-	> Refreshed patch %{P}test.patch
+	> Refreshed patch %{_P}test.patch
 
 	$ quilt remove file2
-	> File subdir/file2 removed from patch %{P}test.patch
+	> File subdir/file2 removed from patch %{_P}test.patch
 
 	$ quilt files
 	> subdir/file
diff --git a/test/two.test b/test/two.test
index b29e69b..0659486 100644
--- a/test/two.test
+++ b/test/two.test
@@ -9,15 +9,15 @@
 	$ mkdir dir
 	$ echo "This is file one." > dir/file1
 	$ quilt add dir/file1
-	> File d/dir/file1 added to patch %{P}patch1.diff
+	> File d/dir/file1 added to patch %{_P}patch1.diff
 
 	$ quilt add file2
-	> File d/file2 added to patch %{P}patch1.diff
+	> File d/file2 added to patch %{_P}patch1.diff
 
 	$ quilt diff
 	$ quilt diff -z
 	$ quilt refresh
-	> Nothing in patch %{P}patch1.diff
+	> Nothing in patch %{_P}patch1.diff
 
 	$ echo "This is file two." > file2
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -37,7 +37,7 @@
 	> +This is file two.
 
 	$ quilt refresh
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ quilt diff -z
 	$ echo "Another line has been added." >> dir/file1
@@ -63,7 +63,7 @@
 	$ cd ..
 	
 	$ quilt refresh
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ cd ..
 	$ quilt new patch2.diff
@@ -71,33 +71,33 @@
 
 	$ cd d
 	$ quilt add dir/file3
-	> File d/dir/file3 added to patch %{P}patch2.diff
+	> File d/dir/file3 added to patch %{_P}patch2.diff
 
 	$ echo "This is file three." > dir/file3
 	$ quilt refresh
-	> Refreshed patch %{P}patch2.diff
+	> Refreshed patch %{_P}patch2.diff
 
 	$ quilt add -p patch1 dir/file3
-	> File d/dir/file3 modified by patch %{P}patch2.diff
+	> File d/dir/file3 modified by patch %{_P}patch2.diff
 
 	$ quilt pop -R
-	> Removing patch %{P}patch2.diff
+	> Removing patch %{_P}patch2.diff
 	> Removing d/dir/file3
 	>
-	> Now at patch %{P}patch1.diff
+	> Now at patch %{_P}patch1.diff
 
 	$ quilt add file4
-	> File d/file4 added to patch %{P}patch1.diff
+	> File d/file4 added to patch %{_P}patch1.diff
 
 	$ echo "This is file 4." > file4
 	$ quilt refresh
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ quilt push
-	> Applying patch %{P}patch2.diff
+	> Applying patch %{_P}patch2.diff
 	> patching file d/dir/file3
 	>
-	> Now at patch %{P}patch2.diff
+	> Now at patch %{_P}patch2.diff
 
 	$ cd ..
 	$ quilt new subdir/patch3.diff
@@ -105,7 +105,7 @@
 
 	$ cd d
 	$ quilt add file4
-	> File d/file4 added to patch %{P}subdir/patch3.diff
+	> File d/file4 added to patch %{_P}subdir/patch3.diff
 
 	$ rm file4
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -117,18 +117,18 @@
 	> -This is file 4.
 
 	$ quilt add -p patch2 file4
-	> File d/file4 modified by patch %{P}subdir/patch3.diff
+	> File d/file4 modified by patch %{_P}subdir/patch3.diff
 
 	$ quilt refresh
-	> Refreshed patch %{P}subdir/patch3.diff
+	> Refreshed patch %{_P}subdir/patch3.diff
 
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt refresh patch2
-	> Refreshed patch %{P}patch2.diff
+	> Refreshed patch %{_P}patch2.diff
 
 	$ echo "Another line added." >> file2
 	$ quilt diff -z -P patch1 | sed -e "s/\\t.*//"
-	> More recent patches modify files in patch %{P}patch1.diff
+	> More recent patches modify files in patch %{_P}patch1.diff
 	> Index: d/d/file2
 	> ===================================================================
 	> --- d.orig/d/file2
@@ -138,24 +138,24 @@
 	> +Another line added.
 	
 	$ quilt refresh patch1
-	> More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f.
+	> More recent patches modify files in patch %{_P}patch1.diff. Enforce refresh with -f.
 	
 	$ quilt refresh -f patch1
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 	
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt pop -R
-	> Removing patch %{P}subdir/patch3.diff
+	> Removing patch %{_P}subdir/patch3.diff
 	> Restoring d/file4
 	>
-	> Now at patch %{P}patch2.diff
+	> Now at patch %{_P}patch2.diff
 
 	$ quilt refresh patch2
-	> Refreshed patch %{P}patch2.diff
+	> Refreshed patch %{_P}patch2.diff
 
 	$ quilt pop -qaR
-	> Removing patch %{P}patch2.diff
-	> Removing patch %{P}patch1.diff
+	> Removing patch %{_P}patch2.diff
+	> Removing patch %{_P}patch1.diff
 	> No patches applied
 
 	$ cd ../..