Merge branch 'busybox' into merge

2 files changed, 7 insertions, 1 deletions

diff --git a/testsuite/bunzip2.tests b/testsuite/bunzip2.tests
index edb332748..69e34dfd0 100755
--- a/testsuite/bunzip2.tests
+++ b/testsuite/bunzip2.tests
@@ -562,7 +562,7 @@ if test "${0##*/}" = "bunzip2.tests"; then
     fi
 
     errout="`${bb}bunzip2 <bz2_issue_12.bz2 2>&1 >/dev/null`"
-    if test x"$errout:$?" = x"bunzip2: bunzip error -3:1"; then
+    if test x"$errout:$?" = x"bunzip2: bunzip error -5:1"; then
         echo "PASS: $unpack: bz2_issue_12.bz2 corrupted example"
     else
         echo "FAIL: $unpack: bz2_issue_12.bz2 corrupted example"
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 675cb4f10..67ff87e93 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -361,6 +361,12 @@ testing "sed /regex/,+N{...} addresses work" \
         "" \
         "1\n2\n3\n4\n5\n"
 
+testing "sed /regex/,+N{...} addresses work 2" \
+        "sed -n '/a/,+1 p'" \
+        "a\n1\na\n2\na\n3\n" \
+        "" \
+        "a\n1\nc\nc\na\n2\na\n3\n"
+
 testing "sed /regex/,+N{...} -i works" \
         "cat - >input2; sed /^4/,+2{d} -i input input2; echo \$?; cat input input2; rm input2" \
         "0\n""1\n2\n3\n7\n8\n""1\n2\n7\n8\n" \