Re: diffutils test failure on nixos/hydra's solaris build

[Bruno Haible]

Jim Meyering wrote on 2012-08-28:
>     FAIL: test-localeconv (exit: 262)
>     =================================
> 
>     test-localeconv.c:41: assertion failed
> 
> which corresponds to this line:
> 
>     $ cat -n tests/test-localeconv.c|grep -B6 41
>         35    {
>         36      struct lconv *l = localeconv ();
>         37
>         38      ASSERT (STREQ (l->decimal_point, "."));
>         39      ASSERT (STREQ (l->thousands_sep, ""));
>         40  #if !defined __FreeBSD__
>         41      ASSERT (STREQ (l->grouping, ""));
> 

It's easy to work around the failure. Since that particular test
is already exempted on FreeBSD, it's not a big deal to also disable
it on Solaris 11.


2012-09-30  Bruno Haible  <address@hidden>

        localeconv tests: Avoid test failure on OpenIndiana.
        * tests/test-localeconv.c (main): On OpenIndiana (a Solaris 11 variant)
        skip the 'grouping' and 'mon_grouping' tests.
        Reported by Jim Meyering.

--- tests/test-localeconv.c.orig        Sun Sep 30 23:36:32 2012
+++ tests/test-localeconv.c     Sun Sep 30 23:33:23 2012
@@ -37,13 +37,13 @@
 
     ASSERT (STREQ (l->decimal_point, "."));
     ASSERT (STREQ (l->thousands_sep, ""));
-#if !defined __FreeBSD__
+#if !(defined __FreeBSD__ || defined __sun)
     ASSERT (STREQ (l->grouping, ""));
 #endif
 
     ASSERT (STREQ (l->mon_decimal_point, ""));
     ASSERT (STREQ (l->mon_thousands_sep, ""));
-#if !defined __FreeBSD__
+#if !(defined __FreeBSD__ || defined __sun)
     ASSERT (STREQ (l->mon_grouping, ""));
 #endif
     ASSERT (STREQ (l->positive_sign, ""));