projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'recvfrom'.
[gnulib.git]
/
tests
/
test-stat-time.c
diff --git
a/tests/test-stat-time.c
b/tests/test-stat-time.c
index
3a0aafc
..
a3706e2
100644
(file)
--- a/
tests/test-stat-time.c
+++ b/
tests/test-stat-time.c
@@
-1,5
+1,5
@@
/* Test of <stat-time.h>.
/* Test of <stat-time.h>.
- Copyright (C) 2007-20
09
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
11
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,22
+22,10
@@
#include <fcntl.h>
#include <signal.h>
#include <fcntl.h>
#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- fflush (stderr); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
enum { NFILES = 4 };
enum { NFILES = 4 };
@@
-96,27
+84,24
@@
do_stat (const char *filename, struct stat *p)
static void
nap (void)
{
static void
nap (void)
{
-#if !HAVE_USLEEP
- /* Assume the worst case file system of FAT, which has a granularity
- of 2 seconds. */
- sleep (2);
-#else /* HAVE_USLEEP */
static long delay;
if (!delay)
{
static long delay;
if (!delay)
{
- /* Initialize only once, by sleeping for
15
milliseconds (needed
+ /* Initialize only once, by sleeping for
20
milliseconds (needed
since xfs has a quantization of about 10 milliseconds, even
since xfs has a quantization of about 10 milliseconds, even
- though it has a granularity of 1 nanosecond). If the seconds
+ though it has a granularity of 1 nanosecond, and since NTFS
+ has a default quantization of 15.25 milliseconds, even though
+ it has a granularity of 100 nanoseconds). If the seconds
differ, repeat the test one more time (in case we crossed a
quantization boundary on a file system with 1 second
resolution). If we can't observe a difference in only the
differ, repeat the test one more time (in case we crossed a
quantization boundary on a file system with 1 second
resolution). If we can't observe a difference in only the
- nanoseconds, then fall back to
2 seconds. However, note that
-
usleep (2000000) is allowed to fail with EINVAL
. */
+ nanoseconds, then fall back to
1 second if the time is odd,
+
and 2 seconds (needed for FAT) if time is even
. */
struct stat st1;
struct stat st2;
ASSERT (stat ("t-stt-stamp1", &st1) == 0);
ASSERT (force_unlink ("t-stt-stamp1") == 0);
struct stat st1;
struct stat st2;
ASSERT (stat ("t-stt-stamp1", &st1) == 0);
ASSERT (force_unlink ("t-stt-stamp1") == 0);
- delay =
15
000;
+ delay =
20
000;
usleep (delay);
create_file ("t-stt-stamp1");
ASSERT (stat ("t-stt-stamp1", &st2) == 0);
usleep (delay);
create_file ("t-stt-stamp1");
ASSERT (stat ("t-stt-stamp1", &st2) == 0);
@@
-131,13
+116,9
@@
nap (void)
}
if (! (st1.st_mtime == st2.st_mtime
&& get_stat_mtime_ns (&st1) < get_stat_mtime_ns (&st2)))
}
if (! (st1.st_mtime == st2.st_mtime
&& get_stat_mtime_ns (&st1) < get_stat_mtime_ns (&st2)))
- delay = 2000000;
+ delay =
(st1.st_mtime & 1) ? 1000000 :
2000000;
}
}
- if (delay == 2000000)
- sleep (2);
- else
- usleep (delay);
-#endif /* HAVE_USLEEP */
+ usleep (delay);
}
static void
}
static void
@@
-252,7
+233,7
@@
test_birthtime (const struct stat *statinfo,
}
int
}
int
-main ()
+main (
void
)
{
struct stat statinfo[NFILES];
struct timespec modtimes[NFILES];
{
struct stat statinfo[NFILES];
struct timespec modtimes[NFILES];