diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/annotate.test | 6 | ||||
| -rw-r--r-- | test/applied.test | 2 | ||||
| -rw-r--r-- | test/comments.test | 4 | ||||
| -rw-r--r-- | test/conflicts.test | 6 | ||||
| -rw-r--r-- | test/delete.test | 4 | ||||
| -rw-r--r-- | test/dotglob.test | 6 | ||||
| -rw-r--r-- | test/empty.test | 4 | ||||
| -rw-r--r-- | test/example1.test | 2 | ||||
| -rw-r--r-- | test/fold.test | 6 | ||||
| -rw-r--r-- | test/formats.test | 2 | ||||
| -rw-r--r-- | test/header.test | 4 | ||||
| -rw-r--r-- | test/import.test | 4 | ||||
| -rw-r--r-- | test/import2.test | 4 | ||||
| -rw-r--r-- | test/mail.test | 2 | ||||
| -rw-r--r-- | test/missing.test | 2 | ||||
| -rw-r--r-- | test/one.test | 6 | ||||
| -rw-r--r-- | test/remember-locations.test | 2 | ||||
| -rw-r--r-- | test/remove-trailing-ws.test | 46 | ||||
| -rwxr-xr-x | test/run | 2 | ||||
| -rw-r--r-- | test/two.test | 8 |
20 files changed, 61 insertions, 61 deletions
diff --git a/test/annotate.test b/test/annotate.test index 556fa85..bca376f 100644 --- a/test/annotate.test +++ b/test/annotate.test @@ -1,5 +1,5 @@ $ mkdir patches - + $ cat > foo < foo < bar @@ -25,10 +25,10 @@ $ quilt new patch2 > Patch patches/patch2 is now on top - + $ quilt add foo > File foo added to patch patches/patch2 - + $ sed -e 's:Baz:baz:' foo > foo.new $ mv foo.new foo $ quilt refresh diff --git a/test/applied.test b/test/applied.test index 9840404..272f6bc 100644 --- a/test/applied.test +++ b/test/applied.test @@ -1,5 +1,5 @@ $ mkdir patches - + $ echo a > a $ echo b > b $ diff -u a b > patches/patch diff --git a/test/comments.test b/test/comments.test index bbf34ff..6180a26 100644 --- a/test/comments.test +++ b/test/comments.test @@ -58,10 +58,10 @@ accidentally removed. > ! one > --- 1 ---- > ! two - + $ quilt refresh > Refreshed patch %{P}test.diff - + $ cat patches/test.diff > C1 > diff --git a/test/conflicts.test b/test/conflicts.test index 21c8499..a5eb819 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -20,17 +20,17 @@ anymore, then the patch is fixed. < e < f < g - + $ quilt new a.diff > Patch %{P}a.diff is now on top $ echo %{?} > 0 - + $ quilt add one.txt > File one.txt added to patch %{P}a.diff $ echo %{?} > 0 - + $ mv one.txt one.orig $ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt $ quilt refresh diff --git a/test/delete.test b/test/delete.test index 1f57928..e7029ad 100644 --- a/test/delete.test +++ b/test/delete.test @@ -38,7 +38,7 @@ Test the delete command. $ quilt pop > Removing patch %{P}test2 > Restoring test.txt - > + > > Now at patch %{P}test1 $ quilt series @@ -54,7 +54,7 @@ Test the delete command. $ quilt pop > Removing patch %{P}test1 > Restoring test.txt - > + > > No patches applied $ quilt delete test1 diff --git a/test/dotglob.test b/test/dotglob.test index b325806..d190226 100644 --- a/test/dotglob.test +++ b/test/dotglob.test @@ -2,14 +2,14 @@ $ quilt new dotglob.diff > Patch patches/dotglob.diff is now on top - + $ quilt add .foo > File .foo added to patch patches/dotglob.diff - + $ echo dot-foo > .foo $ quilt refresh > Refreshed patch patches/dotglob.diff - + $ quilt pop -q > Removing patch patches/dotglob.diff > No patches applied diff --git a/test/empty.test b/test/empty.test index b765917..8ff4b55 100644 --- a/test/empty.test +++ b/test/empty.test @@ -4,7 +4,7 @@ < empty1.diff < empty2.diff $ touch patches/empty1.diff patches/empty2.diff - + $ quilt push -qa > Applying patch %{P}empty1.diff > Patch %{P}empty1.diff appears to be empty; applied @@ -22,7 +22,7 @@ $ quilt new empty_new.diff > Patch %{P}empty_new.diff is now on top - + $ quilt pop -q > Patch %{P}empty_new.diff appears to be empty, removing > No patches applied diff --git a/test/example1.test b/test/example1.test index 50e0158..ec73b81 100644 --- a/test/example1.test +++ b/test/example1.test @@ -108,7 +108,7 @@ Or ``quilt edit Oberon.txt'' < The juice of it on sleeping eye-lids laid < Will make a man or woman madly dote < Upon the next live creature that it sees. - + $ quilt refresh -p ab > Refreshed patch %{P}flower.diff $ rm -f Oberon.txt.rej diff --git a/test/fold.test b/test/fold.test index aa1a79e..4a3ff1e 100644 --- a/test/fold.test +++ b/test/fold.test @@ -2,7 +2,7 @@ $ cat > patches/series < patch1.diff - + $ cat > patches/patch1.diff < --- q.orig/file1.txt < +++ q/file1.txt @@ -26,7 +26,7 @@ < +++ q/file2.txt < @@ -1 +0,0 @@ < -This is file2.txt. - < --- q.orig/dir/file3.txt + < --- q.orig/dir/file3.txt < +++ q/dir/file3.txt < @@ -0,0 +1 @@ < +This is file3.txt. @@ -47,7 +47,7 @@ $ cd dir $ quilt fold -q - < --- dir.orig/file3.txt + < --- dir.orig/file3.txt < +++ dir/file3.txt < @@ -1 +1 @@ < -This is file3.txt. diff --git a/test/formats.test b/test/formats.test index 43b3ae4..cd10bfe 100644 --- a/test/formats.test +++ b/test/formats.test @@ -105,7 +105,7 @@ > 2 > ! new > 4 - + $ quilt diff -p ab > Index: b/test.txt > =================================================================== diff --git a/test/header.test b/test/header.test index 0316129..f6367b5 100644 --- a/test/header.test +++ b/test/header.test @@ -6,7 +6,7 @@ $ quilt add foo > File foo added to patch patches/patch - + $ echo bar > foo $ quilt refresh -p ab > Refreshed patch patches/patch @@ -20,7 +20,7 @@ $ quilt header -r < Header2 > Replaced header of patch patches/patch - + $ quilt header > Header2 diff --git a/test/import.test b/test/import.test index 6336854..0be055d 100644 --- a/test/import.test +++ b/test/import.test @@ -89,7 +89,7 @@ # test a few error cases - $ quilt import missing.diff + $ quilt import missing.diff > Patch missing.diff does not exist $ quilt import patches/patch1.diff @@ -139,7 +139,7 @@ # make sure it accepts non-conflicting names # a small presentation problem here - $ cp patches/patch1.diff t/patch1.patch + $ cp patches/patch1.diff t/patch1.patch $ quilt import t/patch1.patch > Importing patch t/patch1.patch (stored as patches/patch1.patch) diff --git a/test/import2.test b/test/import2.test index f839930..3b7150b 100644 --- a/test/import2.test +++ b/test/import2.test @@ -70,7 +70,7 @@ # test a few error cases - $ quilt import missing.diff.gz + $ quilt import missing.diff.gz > Patch missing.diff.gz does not exist $ quilt import patches/patch1.diff.gz @@ -120,7 +120,7 @@ # make sure it accepts non-conflicting names # a small presentation problem here - $ cp patches/patch1.diff.gz t/patch1.patch.gz + $ cp patches/patch1.diff.gz t/patch1.patch.gz $ quilt import t/patch1.patch.gz > Importing patch t/patch1.patch.gz (stored as %{P}patch1.patch.gz) diff --git a/test/mail.test b/test/mail.test index dcf948c..c79276d 100644 --- a/test/mail.test +++ b/test/mail.test @@ -69,7 +69,7 @@ < < Signed-off-by: someone@without.name < - + $ ls patches/ > series $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" $ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" -e "/^Replace-.*:/p" -e "/^Recipient-.*:/p" mbox diff --git a/test/missing.test b/test/missing.test index 3dea09c..74db5c0 100644 --- a/test/missing.test +++ b/test/missing.test @@ -3,7 +3,7 @@ $ cat > patches/series < missing1.diff < missing2.diff - + $ quilt push -qa > Applying patch patches/missing1.diff > Patch patches/missing1.diff does not exist; applied empty patch diff --git a/test/one.test b/test/one.test index 9131d4f..e665b1d 100644 --- a/test/one.test +++ b/test/one.test @@ -133,13 +133,13 @@ of the installed quilt with `make check'. > This is file two. > +Another line added. > Warning: more recent patches modify files in patch %{P}patch1.diff - + $ quilt refresh patch1 > More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f. - + $ quilt refresh -f patch1 > Refreshed patch %{P}patch1.diff - + $ echo "Another line here, too." >> dir/file3 $ quilt pop -R > Removing patch %{P}subdir/patch3.diff diff --git a/test/remember-locations.test b/test/remember-locations.test index 2631df5..65e62f7 100644 --- a/test/remember-locations.test +++ b/test/remember-locations.test @@ -14,7 +14,7 @@ > mychange1 # Verify that the custom location is still used even - # if QUILT_PATCHES is not set + # if QUILT_PATCHES is not set $ quilt new mychange2 > Patch my/changes/mychange2 is now on top # Verify that the root directory can be identified even diff --git a/test/remove-trailing-ws.test b/test/remove-trailing-ws.test index bea48a0..5f5117b 100644 --- a/test/remove-trailing-ws.test +++ b/test/remove-trailing-ws.test @@ -7,26 +7,26 @@ $ cat > files.orig/add < Line 1 < Line 2 < Line 3 -< +< < Line 5 < Line 6 $ cat > files.orig/change < change -< from -< this +< from +< this $ cat > files.orig/complex < Line 1 < Line 2 -< +< < Line 3 < Line 4 -< +< < Line 5 < Line 6 -< +< < Line 7 < Line 8 -< +< < Line 9 < Line 10 $ cat > files.orig/delete @@ -36,35 +36,35 @@ $ cat > files.orig/delete $ cat > files.orig/remove < Line 1 < Line 2 -< +< < Line 3 < Line 4 -< +< < Line 5 < Line 6 $ cat > files.orig/remove-at-end < Line 1 < Line 2 -< +< < Line 3 < Line 4 -< +< < Line 5 < Line 6 -< +< < Line 7 < Line 8 -< +< < Line 9 < Line 10 $ cat > files/add < Line 1 < Line 2 -< +< < Line 3 < Line 4 -< +< < Line 5 < Line 6 $ cat > files/change @@ -76,19 +76,19 @@ $ cat > files/complex < Line 2 < Line 3 < Line 4 -< +< < Line 5 < Line 6 -< +< < Line 7 < Line 8 -< +< < Line 9 < Line A -< +< < Line B < Line C -< +< < Line D < Line E < Line F @@ -101,16 +101,16 @@ $ cat > files/remove < Line 1 < Line 2 < Line 3 -< +< < Line 5 < Line 6 $ cat > files/remove-at-end < Line 1 < Line 2 -< +< < Line 3 < Line 4 -< +< < Line 5 < Line 6 @@ -242,7 +242,7 @@ sub sg($) { my $gid = getgrnam($group) or return 1, [ "sg: group $group does not exist\n" ]; my %groups = map { $_ eq $gid ? () : ($_ => 1) } (split /\s/, $)); - + #print STDERR "<<", join("/", keys %groups), ">>\n"; my $groups = join(" ", ($gid, $gid, keys %groups)); #print STDERR "[[$groups]]\n"; diff --git a/test/two.test b/test/two.test index d6b7f2f..73d4990 100644 --- a/test/two.test +++ b/test/two.test @@ -61,7 +61,7 @@ > +Another line has been added. $ cd .. - + $ quilt refresh > Refreshed patch %{_P}patch1.diff @@ -136,13 +136,13 @@ > This is file two. > +Another line added. > Warning: more recent patches modify files in patch %{_P}patch1.diff - + $ quilt refresh patch1 > More recent patches modify files in patch %{_P}patch1.diff. Enforce refresh with -f. - + $ quilt refresh -f patch1 > Refreshed patch %{_P}patch1.diff - + $ echo "Another line here, too." >> dir/file3 $ quilt pop -R > Removing patch %{_P}subdir/patch3.diff |