>From 69fabe94446fe98cfc6f9203b6a9b18679d12ab7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 15 Mar 2017 20:32:45 +0100 Subject: [PATCH 2/2] 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. --- ChangeLog | 7 +++++++ tests/test-get-rusage-data.c | 2 +- tests/test-localeconv.c | 4 ++-- tests/test-select.h | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a82298..3fe8678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-03-14 Bruno Haible + 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 + 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 3c00680..7577535 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 8ed987a..2fb5c41 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 d79fa7b..aa67ca0 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 -- 2.7.4