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 | |
parent | b47b3ce1bd651c689fae3cac2760f43f453e2b6e (diff) | |
download | busybox-w32-47b03368f34d45a3787e261189d7157b3a63dd29.tar.gz busybox-w32-47b03368f34d45a3787e261189d7157b3a63dd29.tar.bz2 busybox-w32-47b03368f34d45a3787e261189d7157b3a63dd29.zip |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-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 @@ | |||
1 | dt1="`date -R`" | 1 | # When different date's use time() and clock_gettime(), |
2 | # Wait for the start of next second | 2 | # seconds transition may not happen at _exactly_ the same moment. |
3 | dt="$dt1" | 3 | # Therefore we try it several times. |
4 | while test x"$dt" = x"$dt1"; do | ||
5 | dt="`date -R`" | ||
6 | done | ||
7 | 4 | ||
8 | bdt=`busybox date -R` | 5 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
9 | bdt=`busybox date -R` | 6 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
10 | bdt=`busybox date -R` | 7 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
11 | bdt=`busybox date -R` | 8 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
12 | bdt=`busybox date -R` | 9 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
13 | 10 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true | |
14 | # Wtih !FEATURE_DATE_NANO, that is, with time() | 11 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
15 | # instead of clock_gettime(), seconds transition | 12 | test x"`date -R`" = x"`busybox date -R`" && exit 0 || true |
16 | # may not happen at _exactly_ the same moment, | 13 | false |
17 | # but can be delayed. Several busybox date -R | ||
18 | # invocations above are meant to deal with this. | ||
19 | # (two were enough for me, but I added more just in case). | ||
20 | |||
21 | test x"$dt" = x"$bdt" | ||
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 | |||
46 | 46 | ||
47 | 47 | ||
48 | # Bug: mount.shared1 directory shows no files (has to show files a and b) | 48 | # Bug: mount.shared1 directory shows no files (has to show files a and b) |
49 | optional FEATURE_LS_RECURSIVE | 49 | optional FEATURE_LS_RECURSIVE FEATURE_LS_SORTFILES |
50 | testing "mount bind+rshared" "\ | 50 | testing "mount bind+rshared" "\ |
51 | mkdir -p mount.dir mount.shared1 mount.shared2 | 51 | mkdir -p mount.dir mount.shared1 mount.shared2 |
52 | touch mount.dir/a mount.dir/b | 52 | touch mount.dir/a mount.dir/b |