aboutsummaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2016-11-22 00:19:51 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-11-24 11:40:36 +0100
commitcb810c48c036f50c19b08df7e161cdb0550a2abd (patch)
treefe18bf724cb5c53ae9861e778bbf6db1bce712f6 /testsuite
parent2eff59667d3c590f27ee39cd0969b2221af739a0 (diff)
downloadbusybox-w32-cb810c48c036f50c19b08df7e161cdb0550a2abd.tar.gz
busybox-w32-cb810c48c036f50c19b08df7e161cdb0550a2abd.tar.bz2
busybox-w32-cb810c48c036f50c19b08df7e161cdb0550a2abd.zip
patch: fix matching failure
Fix matching failure when plist is advanced while checking for buffered lines - the lines in the hunk that are about to be added should be skipped when checking for matching context. Also add a valid test case that fails with current busybox and is fixed by the change. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/patch.tests45
1 files changed, 45 insertions, 0 deletions
diff --git a/testsuite/patch.tests b/testsuite/patch.tests
index 2759d2ad4..39205242c 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
@@ -242,6 +242,51 @@ patch: can't open 'dir2///file': No such file or directory
242 zxc 242 zxc
243" 243"
244 244
245testing "patch internal buffering bug?" \
246 'patch -p1 2>&1; echo $?; cat input' \
247"\
248patching file input
2490
250foo
251
252
253
254
255
256
2571
2582
2593
260
261bar
262" \
263"\
264foo
265
266
267
268
269
270
271
272bar
273" \
274"\
275--- a/input.orig
276+++ b/input
277@@ -5,5 +5,8 @@ foo
278
279
280
281+1
282+2
283+3
284
285 bar
286--
2872.9.2
288" \
289
245rm input.orig 2>/dev/null 290rm input.orig 2>/dev/null
246 291
247exit $FAILCOUNT 292exit $FAILCOUNT