X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-inttostr.c;h=3039ec32554bc0f7608909d5802514244851f23c;hb=25b6b5120113989e0b91de9d0b75d3d625bbc753;hp=e53d22a064a7b7a632bfec700a42bebae0763a58;hpb=7178c963d36832db334a64ae7046fc43d037b879;p=gnulib.git diff --git a/tests/test-inttostr.c b/tests/test-inttostr.c index e53d22a06..3039ec325 100644 --- a/tests/test-inttostr.c +++ b/tests/test-inttostr.c @@ -1,5 +1,5 @@ /* Test inttostr functions, and incidentally, INT_BUFSIZE_BOUND - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010-2012 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 @@ -32,7 +32,7 @@ #define CAST_VAL(T,V) (TYPE_SIGNED (T) ? (intmax_t) (V) : (uintmax_t) (V)) #define V_min(T) (CAST_VAL (T, TYPE_MINIMUM (T))) #define V_max(T) (CAST_VAL (T, TYPE_MAXIMUM (T))) -#define IS_TIGHT(T) (signed_type_or_expr__(T) == TYPE_SIGNED (T)) +#define IS_TIGHT(T) (_GL_SIGNED_TYPE_OR_EXPR (T) == TYPE_SIGNED (T)) #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) /* Verify that an inttostr function works as advertised. @@ -65,10 +65,24 @@ int main (void) { - CK (int, inttostr); - CK (unsigned int, uinttostr); - CK (off_t, offtostr); - CK (uintmax_t, umaxtostr); - CK (intmax_t, imaxtostr); - return 0; + size_t b_size = 2; + char *b = malloc (b_size); + ASSERT (b); + + /* Ideally we would rely on the snprintf-posix module, in which case + this guard would not be required, but due to limitations in gnulib's + implementation (see modules/snprintf-posix), we cannot. */ + if (snprintf (b, b_size, "%ju", (uintmax_t) 3) == 1 + && b[0] == '3' && b[1] == '\0') + { + CK (int, inttostr); + CK (unsigned int, uinttostr); + CK (off_t, offtostr); + CK (uintmax_t, umaxtostr); + CK (intmax_t, imaxtostr); + return 0; + } + + /* snprintf doesn't accept %ju; skip this test. */ + return 77; }