summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2011-03-07 08:41:54 +0100
committerJean Delvare <jdelvare@suse.de>2011-03-07 08:41:54 +0100
commit99e95b2ac0525fc56e48a922433b0a9521812066 (patch)
tree9f7b151f5be832df1343442b82e61d176a241c91
parent61b68c87dd974205c6cc647b0bdba8d040abc75b (diff)
downloadquilt-99e95b2ac0525fc56e48a922433b0a9521812066.tar.gz
Let the test suite cover "quilt grep".
-rw-r--r--quilt.changes6
-rw-r--r--test/example1.test5
-rw-r--r--test/three.test2
-rw-r--r--test/two.test3
4 files changed, 16 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes
index 60f062f..6b3cdc3 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 7 08:39:54 CET 2011 - jdelvare@suse.de
+
+- test/example1.test, test/two.test, test/three.test: Let the test
+ suite cover "quilt grep".
+
+-------------------------------------------------------------------
Sat Mar 5 21:06:57 CET 2011 - jdelvare@suse.de
- quilt/pop.in: Add missing local variable declaration.
diff --git a/test/example1.test b/test/example1.test
index 822741b..50e0158 100644
--- a/test/example1.test
+++ b/test/example1.test
@@ -111,6 +111,7 @@ Or ``quilt edit Oberon.txt''
$ quilt refresh -p ab
> Refreshed patch %{P}flower.diff
+ $ rm -f Oberon.txt.rej
$ cat Oberon.txt
> Yet mark'd I where the bolt of Cupid fell:
@@ -135,3 +136,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 grep love
+ > Oberon.txt:Before milk-white, now purple with love's wound,
+ > Oberon.txt:And maidens call it love-in-idleness.
diff --git a/test/three.test b/test/three.test
index 91e5d22..a28b48d 100644
--- a/test/three.test
+++ b/test/three.test
@@ -165,3 +165,5 @@
$ quilt pop patch4.diff
> Patch patch4.diff is not in series
+
+ $ quilt grep "not there"
diff --git a/test/two.test b/test/two.test
index 10588a1..5863ac9 100644
--- a/test/two.test
+++ b/test/two.test
@@ -153,6 +153,9 @@
$ quilt refresh patch2
> Refreshed patch %{_P}patch2.diff
+ $ quilt grep -- two
+ > d/file2:This is file two.
+
$ quilt pop -qaR
> Removing patch %{_P}patch2.diff
> Removing patch %{_P}patch1.diff