summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2012-09-28 12:46:54 +0200
committerAndreas Gruenbacher <agruen@linbit.com>2012-09-28 18:39:33 +0200
commitfc5ddce20e783dde69c6903b6270ec4f290b3150 (patch)
treee88d5d626905eeb74cbf1fef250032472b25a5e5
parentac59899327e6b9dca6e64a6b887322c15120fb48 (diff)
downloadpatch-fc5ddce20e783dde69c6903b6270ec4f290b3150.tar.gz
Repair 'backup of unmodified file' test
tests/create-delete: Repair 'backup of unmodified file' test.
-rw-r--r--tests/create-delete13
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/create-delete b/tests/create-delete
index 654246d..7c46166 100644
--- a/tests/create-delete
+++ b/tests/create-delete
@@ -180,7 +180,7 @@ cat > p.diff <<EOF
-1
EOF
-check 'patch -p0 -b < p.diff || echo status: $?' <<EOF
+check 'patch -p0 < p.diff || echo status: $?' <<EOF
patching file target
File target is not empty after patch; not deleting
status: 1
@@ -190,12 +190,6 @@ check 'cat target' <<EOF
2
EOF
-# Patch creates a backup file even when the original file remains unchanged:
-check 'cat target.orig' <<EOF
-1
-2
-EOF
-
# --------------------------------------------------------------
seq 2 > target
@@ -225,7 +219,7 @@ index f76dd23..0000000
Binary files a/target and /dev/null differ
EOF
-check 'patch -p1 < p.diff || echo status: $?' <<EOF
+check 'patch -p1 -b < p.diff || echo status: $?' <<EOF
patching file target
File target is not empty after patch; not deleting
status: 1
@@ -233,6 +227,9 @@ EOF
ncheck 'test -e target'
+# Patch creates a backup file even when the original file remains unchanged:
+ncheck 'test -e target.orig'
+
# ================================================================
# File not expected to become empty does become empty