Merge branch 'busybox' into merge

3 files changed, 35 insertions, 19 deletions

diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index b6d5ebe08..7370805cd 100755
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -104,12 +104,24 @@ mount -r -o loop -t ext2 z1/e2img z2       || { echo 'mount -r -o loop error'; e
 mount -o remount,ro z1                     || { echo 'mount -o remount,ro error'; exit 1; }
 )
 umount -d mount.dir/z2
-##losetup -d /dev/loop*
+##sleep 0.1
 umount -d mount.dir/z1
 rm -rf mount.dir
 echo DONE
 " \
 "DONE\n" "" ""
 
+# On 5.18.0, "umount -d mount.dir/z1" above fails.
+# (It would work with "sleep 0.1" - looks like z1/e2img
+# is momentarily keeping z1 mountpoint busy, even though
+# the "umount" which freed z1/e2img from being the base
+# of z2 mountpoint has returned).
+# Fixing the mess if it did fail:
+if test -d mount.dir/z1; then
+        ls -ld mount.dir/z1/* mount.dir/z1
+        sleep 1
+        umount -d mount.dir/z1
+        rmdir mount.dir/z1 mount.dir
+fi
 
 exit $FAILCOUNT
diff --git a/testsuite/sha1sum.tests b/testsuite/sha1sum.tests
index 7ad1334c3..e6ddb2a86 100755
--- a/testsuite/sha1sum.tests
+++ b/testsuite/sha1sum.tests
@@ -4,10 +4,12 @@
 
 # testing "test name" "cmd" "expected result" "file input" "stdin"
 >EMPTY
+optional FEATURE_MD5_SHA1_SUM_CHECK
 testing "sha1sum: one-space separated input for -c" \
         'echo "da39a3ee5e6b4b0d3255bfef95601890afd80709 EMPTY" | sha1sum -c' \
         "EMPTY: OK\n" \
         "" ""
+SKIP=
 rm EMPTY
 
 . ./md5sum.tests sha1sum d41337e834377140ae7f98460d71d908598ef04f
diff --git a/testsuite/tree.tests b/testsuite/tree.tests
index 4f4a9e30b..1fa66da80 100755
--- a/testsuite/tree.tests
+++ b/testsuite/tree.tests
@@ -18,6 +18,8 @@ tree.tempdir [error opening dir]\n\
 mkdir -p tree2.tempdir
 touch tree2.tempdir/testfile
 
+optional UNICODE_SUPPORT
+
 testing "tree single file" \
         "cd tree2.tempdir && tree" \
         "\
@@ -50,17 +52,17 @@ testing "tree nested directories and files" \
 .\n\
 ├── test1\n\
 ├── test2\n\
-│   ├── a\n\
-│   │   ├── testfile1\n\
-│   │   ├── testfile2\n\
-│   │   ├── testfile3\n\
-│   │   └── testfile4 -> ../b/testfile4\n\
-│   └── b\n\
-│       ├── test3 -> ../../test3\n\
-│       └── testfile4\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\
+    │   └── testfile5\n\
     └── d\n\
         └── testfile6\n\
 \n\
@@ -77,17 +79,17 @@ tree2.tempdir\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\
+│   ├── 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\
+    │   └── testfile5\n\
     └── d\n\
         └── testfile6\n\
 \n\