[git commit master 1/1] patch: uncomment the test which we actually do pass now

Denys Vlasenko vda.linux at googlemail.com
Mon Aug 16 00:56:32 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=3f75d7bfd2c7fc28256f7ce21ee3d8acb7f6a2e1
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 testsuite/patch.tests |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/testsuite/patch.tests b/testsuite/patch.tests
index e663b32..f55b53f 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
@@ -100,13 +100,15 @@ def
  123
 " \
 
-# Currently fails (erroneously appends second "456" line):
-false && testing "patch detects already applied hunk" \
+testing "patch detects already applied hunk at the EOF" \
 	'patch 2>&1; echo $?; cat input' \
 "\
+Possibly reversed hunk 1 at 3
+Hunk 1 FAILED 1/1.
+ abc
+ 123
++456
 patching file input
-patch: hunk #1 FAILED at 2
-patch: 1 out of 1 hunk FAILED
 1
 abc
 123
-- 
1.7.1



More information about the busybox-cvs mailing list