Merge branch 'busybox' into mergeFRP-3466-g53c09d0e1

1 files changed, 18 insertions, 0 deletions

diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 26f8e69cf..e38278810 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -129,6 +129,12 @@ testing "grep -v -f EMPTY_FILE" \
         "" \
         "test\n"
 
+testing "grep -vxf EMPTY_FILE" \
+        "grep -vxf input" \
+        "test\n" \
+        "" \
+        "test\n"
+
 testing "grep -Fw matches only words" \
         "grep -Fw foo input" \
         "" \
@@ -184,6 +190,18 @@ testing "grep -x -v -e EXP1 -e EXP2 finds nothing if either EXP matches" \
         "" \
         "  aa bb cc\n"
 
+testing "grep PATTERN can be a newline-delimited list" \
+        'grep -Fv "$(printf "foo\nbar\n")"' \
+        "baz\n" \
+        "" \
+        "foo\nbar\nbaz\n"
+
+testing "grep -e PATTERN can be a newline-delimited list" \
+        'grep -Fv -e "$(printf "foo\nbar\n")"' \
+        "baz\n" \
+        "" \
+        "foo\nbar\nbaz\n"
+
 # -r on symlink to dir should recurse into dir
 mkdir -p grep.testdir/foo
 echo bar > grep.testdir/foo/file