From: Jim Meyering <meyering@redhat.com>
Date: Fri, 11 Jun 2010 15:31:04 +0000 (+0200)
Subject: test-inttostr: avoid warnings about 4-6KB literal strings
X-Git-Tag: v0.1~4074
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=7178c963d36832db334a64ae7046fc43d037b879;p=gnulib.git

test-inttostr: avoid warnings about 4-6KB literal strings

* tests/test-inttostr.c: Don't use <assert.h>.  Instead, ...
Include "macros.h", for its definition of ASSERT.
(CK): s/assert/ASSERT/
* modules/inttostr-tests (Files): Add macros.h.
---

diff --git a/ChangeLog b/ChangeLog
index 5f9358891..6a366ed35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-11  Jim Meyering  <meyering@redhat.com>
 
+	test-inttostr: avoid warnings about 4-6KB literal strings
+	* tests/test-inttostr.c: Don't use <assert.h>.  Instead, ...
+	Include "macros.h", for its definition of ASSERT.
+	(CK): s/assert/ASSERT/
+	* modules/inttostr-tests (Files): Add macros.h.
+
 	init.sh: don't use $ME_ or skip_ before they are defined
 	* tests/init.sh: Hoist definitions of $ME_ and skip_ to precede
 	their first uses.  Also hoist their companions: warn_, fail_,
diff --git a/modules/inttostr-tests b/modules/inttostr-tests
index f935d90b5..48dbe509b 100644
--- a/modules/inttostr-tests
+++ b/modules/inttostr-tests
@@ -1,4 +1,5 @@
 Files:
+tests/macros.h
 tests/test-inttostr.c
 
 Depends-on:
diff --git a/tests/test-inttostr.c b/tests/test-inttostr.c
index 123aca49a..e53d22a06 100644
--- a/tests/test-inttostr.c
+++ b/tests/test-inttostr.c
@@ -24,7 +24,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
+#include "macros.h"
 
 #define STREQ(a, b) (strcmp (a, b) == 0)
 #define FMT(T) (TYPE_SIGNED (T) ? "%jd" : "%ju")
@@ -46,16 +47,16 @@
       char ref[100];                                                    \
       char *buf = malloc (INT_BUFSIZE_BOUND (T));                       \
       char const *p;                                                    \
-      assert (buf);                                                     \
+      ASSERT (buf);                                                     \
       *buf = '\0';                                                      \
-      assert (snprintf (ref, sizeof ref, FMT (T), V_min (T)) < sizeof ref); \
-      assert (STREQ ((p = Fn (TYPE_MINIMUM (T), buf)), ref));           \
+      ASSERT (snprintf (ref, sizeof ref, FMT (T), V_min (T)) < sizeof ref); \
+      ASSERT (STREQ ((p = Fn (TYPE_MINIMUM (T), buf)), ref));           \
       /* Ensure that INT_BUFSIZE_BOUND is tight for signed types.  */   \
-      assert (! TYPE_SIGNED (T) || (p == buf && *p == '-'));            \
-      assert (snprintf (ref, sizeof ref, FMT (T), V_max (T)) < sizeof ref); \
-      assert (STREQ ((p = Fn (TYPE_MAXIMUM (T), buf)), ref));           \
+      ASSERT (! TYPE_SIGNED (T) || (p == buf && *p == '-'));            \
+      ASSERT (snprintf (ref, sizeof ref, FMT (T), V_max (T)) < sizeof ref); \
+      ASSERT (STREQ ((p = Fn (TYPE_MAXIMUM (T), buf)), ref));           \
       /* For unsigned types, the bound is not always tight.  */         \
-      assert (! IS_TIGHT (T) || TYPE_SIGNED (T)                         \
+      ASSERT (! IS_TIGHT (T) || TYPE_SIGNED (T)                         \
               || (p == buf && ISDIGIT (*p)));                           \
       free (buf);                                                       \
     }                                                                   \