diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/delete.test | 4 | ||||
| -rw-r--r-- | test/example1.test | 2 | ||||
| -rw-r--r-- | test/failbackup.test | 2 | ||||
| -rw-r--r-- | test/import.test | 4 | ||||
| -rw-r--r-- | test/import2.test | 4 | ||||
| -rw-r--r-- | test/three.test | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/test/delete.test b/test/delete.test index 77f2e94..e9a3a1c 100644 --- a/test/delete.test +++ b/test/delete.test @@ -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 diff --git a/test/example1.test b/test/example1.test index 582530c..09e9edc 100644 --- a/test/example1.test +++ b/test/example1.test @@ -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 diff --git a/test/failbackup.test b/test/failbackup.test index 37046f7..d89444f 100644 --- a/test/failbackup.test +++ b/test/failbackup.test @@ -16,7 +16,7 @@ What happens when refresh fails because of a permission error? $ 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 diff --git a/test/import.test b/test/import.test index 0be055d..3a11930 100644 --- a/test/import.test +++ b/test/import.test @@ -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 diff --git a/test/import2.test b/test/import2.test index 3b7150b..dc8aa96 100644 --- a/test/import2.test +++ b/test/import2.test @@ -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 diff --git a/test/three.test b/test/three.test index abbd5a3..364506f 100644 --- a/test/three.test +++ b/test/three.test @@ -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 |