Merge branch 'busybox' into merge

3 files changed, 61 insertions, 0 deletions

diff --git a/testsuite/hexdump.tests b/testsuite/hexdump.tests
index 45a0c1300..cfb20187e 100755
--- a/testsuite/hexdump.tests
+++ b/testsuite/hexdump.tests
@@ -15,4 +15,23 @@ testing 'hexdump -C with four NULs' \
         '' \
         '\0\0\0\0'
 
+testing "hexdump does not think last padded block matches any full block" \
+        "hexdump -e '1/1 \"%02x|\"1/1 \"%02x!\\n\"'" \
+        "\
+00|00!
+*
+00|  !
+" \
+        '' \
+        '\0\0\0\0\0\0\0\0\0\0\0'
+
+testing "hexdump thinks last full block can match" \
+        "hexdump -e '1/1 \"%02x|\"1/1 \"%02x!\\n\"'" \
+        "\
+00|00!
+*
+" \
+        '' \
+        '\0\0\0\0\0\0\0\0\0\0\0\0'
+
 exit $FAILCOUNT
diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests
index 159f1ff69..e7c7c4b3d 100755
--- a/testsuite/xargs.tests
+++ b/testsuite/xargs.tests
@@ -61,4 +61,12 @@ testing "xargs -n2" \
 
 SKIP=
 
+optional FEATURE_XARGS_SUPPORT_QUOTES
+testing "xargs -I skips empty lines and leading whitespace" \
+        "xargs -I% echo '[%]'" \
+        "[2]\n[4]\n[6 6 ]\n[7]\n" \
+        "" " \n2\n\n4\n\n 6 6 \n \v \t 7\n\t\n\v\n"
+
+SKIP=
+
 exit $FAILCOUNT
diff --git a/testsuite/xxd.tests b/testsuite/xxd.tests
new file mode 100755
index 000000000..2e80be5fe
--- /dev/null
+++ b/testsuite/xxd.tests
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Copyright 2020 by Denys Vlasenko <vda.linux@googlemail.com>
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "description" "command" "result" "infile" "stdin"
+testing 'xxd -p with one NUL' \
+        'xxd -p' \
+        "\
+00
+" \
+        '' \
+        '\0'
+
+testing 'xxd -p with 30 NULs' \
+        'xxd -p' \
+        "\
+000000000000000000000000000000000000000000000000000000000000
+" \
+        '' \
+        '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
+
+testing 'xxd -p with 31 NULs' \
+        'xxd -p' \
+        "\
+000000000000000000000000000000000000000000000000000000000000
+00
+" \
+        '' \
+        '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
+
+exit $FAILCOUNT