Merge branch 'busybox' into merge

2 files changed, 31 insertions, 1 deletions

diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index a7a533ba0..b5008290f 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -85,7 +85,8 @@ testing "awk floating const with leading zeroes" \
         "" "\n"
 
 # long field seps requiring regex
-testing "awk long field sep" "awk -F-- '{ print NF, length(\$NF), \$NF }'" \
+testing "awk long field sep" \
+        "awk -F-- '{ print NF, length(\$NF), \$NF }'" \
         "2 0 \n3 0 \n4 0 \n5 0 \n" \
         "" \
         "a--\na--b--\na--b--c--\na--b--c--d--"
@@ -317,6 +318,26 @@ testing "awk length()" \
         "3\n3\n3\n3\n" \
         "" "qwe"
 
+testing "awk print length, 1" \
+        "awk '{ print length, 1 }'" \
+        "0 1\n" \
+        "" "\n"
+
+testing "awk print length 1" \
+        "awk '{ print length 1 }'" \
+        "01\n" \
+        "" "\n"
+
+testing "awk length == 0" \
+        "awk 'length == 0 { print \"foo\" }'" \
+        "foo\n" \
+        "" "\n"
+
+testing "awk if (length == 0)" \
+        "awk '{ if (length == 0) { print \"bar\" } }'" \
+        "bar\n" \
+        "" "\n"
+
 testing "awk -f and ARGC" \
         "awk -f - input" \
         "re\n2\n" \
diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests
index 2d0a201b7..855b33bc2 100755
--- a/testsuite/xargs.tests
+++ b/testsuite/xargs.tests
@@ -41,4 +41,13 @@ testing "xargs -sNUM test 2" \
         "echo 1 2 3 4 5 6 7 8 9 0\n""echo 1 2 3 4 5 6 7 8 9\n""echo 1 00\n" \
         "" "2 3 4 5 6 7 8 9 0 2 3 4 5 6 7 8 9 00\n"
 
+# see that we don't get "argument line too long",
+# but do see the last word, 99999, instead
+optional FEATURE_XARGS_SUPPORT_QUOTES
+testing "xargs argument line too long" \
+        "seq 10000 99999 | sed -e 's/^/\"/' -e 's/$/\"/' | xargs echo | grep -o 99999; echo \$?" \
+        "99999\n0\n" \
+        "" ""
+SKIP=
+
 exit $FAILCOUNT