From fc5ddce20e783dde69c6903b6270ec4f290b3150 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@linbit.com>
Date: Fri, 28 Sep 2012 12:46:54 +0200
Subject: Repair 'backup of unmodified file' test

tests/create-delete: Repair 'backup of unmodified file' test.
---
 tests/create-delete | 13 +++++--------
 1 file 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
 
-- 
cgit v1.2.1