diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/annotate.test | 2 | ||||
-rw-r--r-- | test/applied.test | 2 | ||||
-rw-r--r-- | test/conflicts.test | 2 | ||||
-rw-r--r-- | test/dir-a-b.test | 4 | ||||
-rw-r--r-- | test/null-bug.test | 2 | ||||
-rw-r--r-- | test/one.test | 2 | ||||
-rw-r--r-- | test/remove.test | 2 | ||||
-rw-r--r-- | test/subdir.test | 2 | ||||
-rw-r--r-- | test/two.test | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/test/annotate.test b/test/annotate.test index 1d84604..0c79471 100644 --- a/test/annotate.test +++ b/test/annotate.test @@ -97,7 +97,7 @@ > File jkl added to patch patches/patch4 > File wrz added to patch patches/patch4 - $ rm jkl + $ rm -f jkl $ cat > wrz < one < two diff --git a/test/applied.test b/test/applied.test index 48ea912..f2fa8e8 100644 --- a/test/applied.test +++ b/test/applied.test @@ -6,7 +6,7 @@ $ echo b > b $ diff -u a b > patches/patch $ echo patch -p0 > patches/series - $ rm b + $ rm -f b $ quilt push -q > Applying patch patches/patch > Now at patch patches/patch diff --git a/test/conflicts.test b/test/conflicts.test index 6afa905..11f43f8 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -71,7 +71,7 @@ anymore, then the patch is fixed. $ mv one.txt one.x $ sed -e "s/4/4+/" one.x > one.txt - $ rm one.x + $ rm -f one.x $ quilt diff -z | grep -v "^\\(---\\|+++\\)" > Index: d/one.txt > =================================================================== diff --git a/test/dir-a-b.test b/test/dir-a-b.test index 0255373..4104510 100644 --- a/test/dir-a-b.test +++ b/test/dir-a-b.test @@ -43,7 +43,7 @@ > @@ -1 +0,0 @@ > -d - $ rm patches/ab.diff + $ rm -f patches/ab.diff $ quilt refresh --no-index > Refreshed patch patches/ab.diff @@ -87,7 +87,7 @@ > @@ -1 +0,0 @@ > -d - $ rm patches/ab.diff + $ rm -f patches/ab.diff $ quilt refresh -p ab --no-index > Refreshed patch patches/ab.diff diff --git a/test/null-bug.test b/test/null-bug.test index 74b8c55..5ba7e4d 100644 --- a/test/null-bug.test +++ b/test/null-bug.test @@ -12,7 +12,7 @@ In this case, the original file in the --- line must not have .orig appended or else patch won't know the real original filename anymore. - $ rm file + $ rm -f file $ quilt diff -p0 > Index: file > =================================================================== diff --git a/test/one.test b/test/one.test index 5031f35..b565b20 100644 --- a/test/one.test +++ b/test/one.test @@ -105,7 +105,7 @@ of the installed quilt with `make check'. $ quilt add file4 > File file4 added to patch %{P}subdir/patch3.diff - $ rm file4 + $ rm -f file4 $ quilt diff > Index: d/file4 > =================================================================== diff --git a/test/remove.test b/test/remove.test index 33596e2..06c2f9c 100644 --- a/test/remove.test +++ b/test/remove.test @@ -13,7 +13,7 @@ > File h added to patch patches/p.diff $ echo h1 > h - $ rm g + $ rm -f g $ quilt refresh > Refreshed patch patches/p.diff diff --git a/test/subdir.test b/test/subdir.test index 88d9cac..ead1a22 100644 --- a/test/subdir.test +++ b/test/subdir.test @@ -33,7 +33,7 @@ $ quilt add file3 > File subdir/file3 added to patch %{_P}test.patch - $ rm file3 + $ rm -f file3 $ quilt files -v > subdir/file > + subdir/file2 diff --git a/test/two.test b/test/two.test index a93c4e4..5770724 100644 --- a/test/two.test +++ b/test/two.test @@ -108,7 +108,7 @@ $ quilt add file4 > File d/file4 added to patch %{_P}subdir/patch3.diff - $ rm file4 + $ rm -f file4 $ quilt diff > Index: d/d/file4 > =================================================================== |