diff options
author | Bruno Haible <bruno@clisp.org> | 2011-02-08 11:20:08 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2011-02-08 11:22:18 +0100 |
commit | 28134edcb40e5ef85aa86742976da4a02cba47c9 (patch) | |
tree | 6165b58088f8d7bd2f7bcf36b734dd583a43098d /tests | |
parent | 7ea1fac8cffd51fcdd8aa62e3a6ef0691abeece3 (diff) | |
download | gnulib-28134edcb40e5ef85aa86742976da4a02cba47c9.tar.gz |
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.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-di-set.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/tests/test-di-set.c b/tests/test-di-set.c index 5de8da2fff..f3ea690e8f 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); |