Merge branch 'busybox' into merge

5 files changed, 160 insertions, 0 deletions

diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 93e25d8c1..bbf0fbff1 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -479,4 +479,10 @@ testing 'awk backslash+newline eaten with no trace' \
         "Hello world\n" \
         '' ''
 
+testing 'awk assign while test' \
+        "awk '\$1==\$1=\"foo\" {print \$1}'" \
+        "foo\n" \
+        "" \
+        "foo"
+
 exit $FAILCOUNT
diff --git a/testsuite/sha1sum.tests b/testsuite/sha1sum.tests
index a968fa87c..7ad1334c3 100755
--- a/testsuite/sha1sum.tests
+++ b/testsuite/sha1sum.tests
@@ -1,3 +1,13 @@
 #!/bin/sh
 
+. ./testing.sh
+
+# testing "test name" "cmd" "expected result" "file input" "stdin"
+>EMPTY
+testing "sha1sum: one-space separated input for -c" \
+        'echo "da39a3ee5e6b4b0d3255bfef95601890afd80709 EMPTY" | sha1sum -c' \
+        "EMPTY: OK\n" \
+        "" ""
+rm EMPTY
+
 . ./md5sum.tests sha1sum d41337e834377140ae7f98460d71d908598ef04f
diff --git a/testsuite/sort.tests b/testsuite/sort.tests
index ff33e21b4..8dbadbdae 100755
--- a/testsuite/sort.tests
+++ b/testsuite/sort.tests
@@ -219,4 +219,25 @@ testing "sort -h" \
 
 # testing "description" "command(s)" "result" "infile" "stdin"
 
+testing "sort -k2,2M" \
+"sort -k2,2M input" "\
+3 March
+2 April
+1  May
+" "\
+2 April
+1  May
+3 March
+" ""
+
+testing "sort -s -u" \
+"sort -s -u -k 2 input" "\
+z a
+z b
+" "\
+z b
+a b
+z a
+a a" ""
+
 exit $FAILCOUNT
diff --git a/testsuite/tree.tests b/testsuite/tree.tests
new file mode 100755
index 000000000..4f4a9e30b
--- /dev/null
+++ b/testsuite/tree.tests
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Copyright 2022 by Roger Knecht <rknecht@pm.me>
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+. ./testing.sh -v
+
+# testing "description" "command" "result" "infile" "stdin"
+
+testing "tree error opening dir" \
+        "tree tree.tempdir" \
+        "\
+tree.tempdir [error opening dir]\n\
+\n\
+0 directories, 0 files\n" \
+        "" ""
+
+mkdir -p tree2.tempdir
+touch tree2.tempdir/testfile
+
+testing "tree single file" \
+        "cd tree2.tempdir && tree" \
+        "\
+.\n\
+└── testfile\n\
+\n\
+0 directories, 1 files\n" \
+        "" ""
+
+mkdir -p tree3.tempdir/test1 \
+         tree3.tempdir/test2/a \
+         tree3.tempdir/test2/b \
+         tree3.tempdir/test3/c \
+         tree3.tempdir/test3/d
+
+touch tree3.tempdir/test2/a/testfile1 \
+        tree3.tempdir/test2/a/testfile2 \
+        tree3.tempdir/test2/a/testfile3 \
+        tree3.tempdir/test2/b/testfile4 \
+        tree3.tempdir/test3/c/testfile5 \
+        tree3.tempdir/test3/d/testfile6 \
+        tree3.tempdir/test3/d/.testfile7
+
+(cd tree3.tempdir/test2/a && ln -s ../b/testfile4 .)
+(cd tree3.tempdir/test2/b && ln -s ../../test3 .)
+
+testing "tree nested directories and files" \
+        "cd tree3.tempdir && tree" \
+        "\
+.\n\
+├── test1\n\
+├── test2\n\
+│   ├── a\n\
+│   │   ├── testfile1\n\
+│   │   ├── testfile2\n\
+│   │   ├── testfile3\n\
+│   │   └── testfile4 -> ../b/testfile4\n\
+│   └── b\n\
+│       ├── test3 -> ../../test3\n\
+│       └── testfile4\n\
+└── test3\n\
+    ├── c\n\
+    │   └── testfile5\n\
+    └── d\n\
+        └── testfile6\n\
+\n\
+7 directories, 8 files\n" \
+        "" ""
+#note: tree v2.0.1 says "8 directories, 7 files":
+#it counts "test3 -> ../../test3" as a directory, even though it does not follow this symlink
+
+testing "tree multiple directories" \
+        "tree tree2.tempdir tree3.tempdir" \
+        "\
+tree2.tempdir\n\
+└── testfile\n\
+tree3.tempdir\n\
+├── test1\n\
+├── test2\n\
+│   ├── a\n\
+│   │   ├── testfile1\n\
+│   │   ├── testfile2\n\
+│   │   ├── testfile3\n\
+│   │   └── testfile4 -> ../b/testfile4\n\
+│   └── b\n\
+│       ├── test3 -> ../../test3\n\
+│       └── testfile4\n\
+└── test3\n\
+    ├── c\n\
+    │   └── testfile5\n\
+    └── d\n\
+        └── testfile6\n\
+\n\
+7 directories, 9 files\n" \
+        "" ""
+#note: tree v2.0.1 says "8 directories, 7 files" (not "8 files", probably a/testfile4 -> ../b/testfile4 and b/testfile4 are counted as one file, not 2?)
+
+rm -rf tree.tempdir tree2.tempdir tree3.tempdir
+
+exit $FAILCOUNT
diff --git a/testsuite/xxd.tests b/testsuite/xxd.tests
index 76fa96af9..2c740abc8 100755
--- a/testsuite/xxd.tests
+++ b/testsuite/xxd.tests
@@ -37,4 +37,27 @@ testing 'xxd -p -r' \
         '' \
         '30313233343536373736353433323130 30313233343536373736353433323130'
 
+testing 'xxd -r skips leading whitespace and truncates at two spaces' \
+        'xxd -r' \
+        '0123456789:;<=>?@' \
+        '' "\
+   00000000: 3031 3233 3435 3637 3839 3a3b 3c3d 3e3f  0123456789:;<=>?
+        00000010: 40                                       @
+"
+
+testing 'xxd -p -r skips one bad char, truncates at two bad chars' \
+        'xxd -p -r' \
+        '01' \
+        '' "\
+30 !31 !!32
+"
+
+testing 'xxd -p -r ignores the nibble with 2nd char bad' \
+        'xxd -p -r' \
+        '3C6' \
+        '' "\
+33 3!4 3!!5
+36
+"
+
 exit $FAILCOUNT