From 28134edcb40e5ef85aa86742976da4a02cba47c9 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 8 Feb 2011 11:20:08 +0100
Subject: [PATCH] di-set tests: Refactor.

* tests/test-di-set.c: Include di-set.h early. Include macros.h. Drop
unnecessary includes.
(ASSERT): Remove macro.
(main): Make C90 compliant by avoiding variable declaration after
statement.
* modules/di-set-tests (Files): Add tests/macros.h.
---
 ChangeLog            | 10 ++++++++++
 modules/di-set-tests |  1 +
 tests/test-di-set.c  | 30 +++++++++---------------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61bc9aa43..5b9d8bf27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-02-08  Bruno Haible  <bruno@clisp.org>
 
+	di-set tests: Refactor.
+	* tests/test-di-set.c: Include di-set.h early. Include macros.h. Drop
+	unnecessary includes.
+	(ASSERT): Remove macro.
+	(main): Make C90 compliant by avoiding variable declaration after
+	statement.
+	* modules/di-set-tests (Files): Add tests/macros.h.
+
+2011-02-08  Bruno Haible  <bruno@clisp.org>
+
 	ino-map tests: Refactor.
 	* tests/test-ino-map.c: Include ino-map.h early. Include macros.h. Drop
 	unnecessary includes.
diff --git a/modules/di-set-tests b/modules/di-set-tests
index d60f7fdc6..22bd7c1bf 100644
--- a/modules/di-set-tests
+++ b/modules/di-set-tests
@@ -1,5 +1,6 @@
 Files:
 tests/test-di-set.c
+tests/macros.h
 
 Depends-on:
 
diff --git a/tests/test-di-set.c b/tests/test-di-set.c
index 5de8da2ff..f3ea690e8 100644
--- a/tests/test-di-set.c
+++ b/tests/test-di-set.c
@@ -17,25 +17,11 @@
 /* Written by Jim Meyering.  */
 
 #include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 
 #include "di-set.h"
 
+#include "macros.h"
+
 int
 main (void)
 {
@@ -53,11 +39,13 @@ main (void)
   ASSERT (di_set_insert (dis, 5, (ino_t) -1) == 1);
   ASSERT (di_set_insert (dis, 5, (ino_t) -1) == 0); /* dup */
 
-  unsigned int i;
-  for (i = 0; i < 3000; i++)
-    ASSERT (di_set_insert (dis, 9, i) == 1);
-  for (i = 0; i < 3000; i++)
-    ASSERT (di_set_insert (dis, 9, i) == 0); /* duplicate fails */
+  {
+    unsigned int i;
+    for (i = 0; i < 3000; i++)
+      ASSERT (di_set_insert (dis, 9, i) == 1);
+    for (i = 0; i < 3000; i++)
+      ASSERT (di_set_insert (dis, 9, i) == 0); /* duplicate fails */
+  }
 
   di_set_free (dis);
 
-- 
2.11.0