Merge branch 'busybox' into merge

3 files changed, 44 insertions, 0 deletions

diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 323b3849d..f6d9f2105 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -171,6 +171,26 @@ testing "grep -w word match second word" \
         "bword,word\n""wordb,word\n""bwordb,word\n" \
         ""
 
+# -r on symlink to dir should recurse into dir
+mkdir -p grep.testdir/foo
+echo bar > grep.testdir/foo/file
+ln -s foo grep.testdir/symfoo
+testing "grep -r on symlink to dir" \
+        "grep -r . grep.testdir/symfoo" \
+        "grep.testdir/symfoo/file:bar\n" \
+        "" ""
+rm -Rf grep.testdir
+
+# But -r on dir/symlink_to_dir should not recurse into symlink_to_dir
+mkdir -p grep.testdir/foo
+echo bar > grep.testdir/foo/file
+ln -s foo grep.testdir/symfoo
+testing "grep -r on dir/symlink to dir" \
+        "grep -r . grep.testdir" \
+        "grep.testdir/foo/file:bar\n" \
+        "" ""
+rm -Rf grep.testdir
+
 # testing "test name" "commands" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 9494ac2de..19f2915ce 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -329,6 +329,10 @@ line with \\
 continuation
 "
 
+testing "sed s///NUM test" \
+        "sed -e 's/a/b/2; s/a/c/g'" \
+        "cb\n" "" "aa\n"
+
 # testing "description" "commands" "result" "infile" "stdin"
 
 exit $FAILCOUNT
diff --git a/testsuite/test.tests b/testsuite/test.tests
index 2c92e34ba..1c2edaf62 100755
--- a/testsuite/test.tests
+++ b/testsuite/test.tests
@@ -76,4 +76,24 @@ testing "test ! a = b -a ! c = d: should be true (0)" \
         "0\n" \
         "" ""
 
+testing "test '!' = '!': should be true (0)" \
+        "busybox test '!' = '!'; echo \$?" \
+        "0\n" \
+        "" ""
+
+testing "test '(' = '(': should be true (0)" \
+        "busybox test '(' = '('; echo \$?" \
+        "0\n" \
+        "" ""
+
+testing "test '!' '!' = '!': should be false (1)" \
+        "busybox test '!' '!' = '!'; echo \$?" \
+        "1\n" \
+        "" ""
+
+testing "test '!' '(' = '(': should be false (1)" \
+        "busybox test '!' '(' = '('; echo \$?" \
+        "1\n" \
+        "" ""
+
 exit $FAILCOUNT