diff options
| author | Bruno Haible <bruno@clisp.org> | 2017-03-15 20:32:45 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2017-03-15 20:32:45 +0100 |
| commit | 69fabe94446fe98cfc6f9203b6a9b18679d12ab7 (patch) | |
| tree | 86491bece5bc0ff68304423e7f484a8c8b283a45 | |
| parent | df17c50823c30724c3401dc17fa27f84d28070fd (diff) | |
| download | gnulib-69fabe94446fe98cfc6f9203b6a9b18679d12ab7.tar.gz | |
Fix test failures on DragonFlyBSD.
* tests/test-localeconv.c (main): Treat DragonFlyBSD like FreeBSD.
* tests/test-select.h (test_bad_fd): Likewise.
* tests/test-get-rusage-data.c (main): Treat DragonFlyBSD like OpenBSD.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | tests/test-get-rusage-data.c | 2 | ||||
| -rw-r--r-- | tests/test-localeconv.c | 4 | ||||
| -rw-r--r-- | tests/test-select.h | 4 |
4 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2017-03-14 Bruno Haible <bruno@clisp.org> + Fix test failures on DragonFlyBSD. + * tests/test-localeconv.c (main): Treat DragonFlyBSD like FreeBSD. + * tests/test-select.h (test_bad_fd): Likewise. + * tests/test-get-rusage-data.c (main): Treat DragonFlyBSD like OpenBSD. + +2017-03-14 Bruno Haible <bruno@clisp.org> + freadahead: Silence warning on DragonFlyBSD. * lib/freadahead.c (__sreadahead): Declare ourselves. diff --git a/tests/test-get-rusage-data.c b/tests/test-get-rusage-data.c index 3c006807c8..75775358a1 100644 --- a/tests/test-get-rusage-data.c +++ b/tests/test-get-rusage-data.c @@ -55,7 +55,7 @@ main () ASSERT (value2 >= value1); ASSERT (value3 >= value2); -#if !((defined __APPLE__ && defined __MACH__) || defined __OpenBSD__ || (defined _WIN32 || defined __WIN32__) || defined __CYGWIN__) +#if !((defined __APPLE__ && defined __MACH__) || defined __DragonFly__ || defined __OpenBSD__ || (defined _WIN32 || defined __WIN32__) || defined __CYGWIN__) /* Allocating 2.5 MB of memory should increase the data segment size. */ ASSERT (value3 > value1); #endif diff --git a/tests/test-localeconv.c b/tests/test-localeconv.c index 8ed987afbe..2fb5c41964 100644 --- a/tests/test-localeconv.c +++ b/tests/test-localeconv.c @@ -37,13 +37,13 @@ main () ASSERT (STREQ (l->decimal_point, ".")); ASSERT (STREQ (l->thousands_sep, "")); -#if !(defined __FreeBSD__ || defined __sun) +#if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun) ASSERT (STREQ (l->grouping, "")); #endif ASSERT (STREQ (l->mon_decimal_point, "")); ASSERT (STREQ (l->mon_thousands_sep, "")); -#if !(defined __FreeBSD__ || defined __sun) +#if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun) ASSERT (STREQ (l->mon_grouping, "")); #endif ASSERT (STREQ (l->positive_sign, "")); diff --git a/tests/test-select.h b/tests/test-select.h index d79fa7bf02..aa67ca0c10 100644 --- a/tests/test-select.h +++ b/tests/test-select.h @@ -292,8 +292,8 @@ test_bad_fd (select_fn my_select) /* On Linux, Mac OS X, *BSD, values of fd like 99 or 399 are discarded by the kernel early and therefore do *not* lead to EBADF, as required by POSIX. */ -# if defined __linux__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ - fd = 16; +# if defined __linux__ || (defined __APPLE__ && defined __MACH__) || (defined __FreeBSD__ || defined __DragonFly__) || defined __OpenBSD__ || defined __NetBSD__ + fd = 14; # else fd = 99; # endif |