diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-08-10 10:45:48 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-08-10 10:45:48 +0200 |
| commit | 47b03368f34d45a3787e261189d7157b3a63dd29 (patch) | |
| tree | b9a3d29a2e65ff7363f25cf7be948adea19a7257 /testsuite | |
| parent | b47b3ce1bd651c689fae3cac2760f43f453e2b6e (diff) | |
| download | busybox-47b03368f34d45a3787e261189d7157b3a63dd29.tar.gz | |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/date/date-R-works | 32 | ||||
| -rwxr-xr-x | testsuite/mount.tests | 2 |
2 files changed, 13 insertions, 21 deletions
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 |