From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 10 Aug 2011 08:45:48 +0000 (+0200)
Subject: randomconfig fixes
X-Git-Tag: 1_19_0~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=47b03368f34d45a3787e261189d7157b3a63dd29;p=oweals%2Fbusybox.git

randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/testsuite/date/date-R-works b/testsuite/date/date-R-works
index 12f9b96ed..81378cc69 100644
--- a/testsuite/date/date-R-works
+++ b/testsuite/date/date-R-works
@@ -1,21 +1,13 @@
-dt1="`date -R`"
-# Wait for the start of next second
-dt="$dt1"
-while test x"$dt" = x"$dt1"; do
-    dt="`date -R`"
-done
+# When different date's use time() and clock_gettime(),
+# seconds transition may not happen at _exactly_ the same moment.
+# Therefore we try it several times.
 
-bdt=`busybox date -R`
-bdt=`busybox date -R`
-bdt=`busybox date -R`
-bdt=`busybox date -R`
-bdt=`busybox date -R`
-
-# Wtih !FEATURE_DATE_NANO, that is, with time()
-# instead of clock_gettime(), seconds transition
-# may not happen at _exactly_ the same moment,
-# but can be delayed. Several busybox date -R
-# invocations above are meant to deal with this.
-# (two were enough for me, but I added more just in case).
-
-test x"$dt" = x"$bdt"
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+test x"`date -R`" = x"`busybox date -R`" && exit 0 || true
+false
diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index 9ddd58795..c5891be83 100755
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -46,7 +46,7 @@ rm mount.image1m
 
 
 # Bug: mount.shared1 directory shows no files (has to show files a and b)
-optional FEATURE_LS_RECURSIVE
+optional FEATURE_LS_RECURSIVE FEATURE_LS_SORTFILES
 testing "mount bind+rshared" "\
 mkdir -p mount.dir mount.shared1 mount.shared2
 touch mount.dir/a mount.dir/b