Mercurial > hg > octave-nkf > gnulib-hg
changeset 14308:3bdf4414b758
ino-map tests: Refactor.
* tests/test-ino-map.c: Include ino-map.h early. Include macros.h. Drop
unnecessary includes.
(ASSERT): Remove macro.
(main): Make C90 compliant by avoiding variable declaration after
statement.
* modules/ino-map-tests (Files): Add tests/macros.h.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 08 Feb 2011 11:18:45 +0100 |
parents | 569d4910c334 |
children | 93b787ac4b80 |
files | ChangeLog modules/ino-map-tests tests/test-ino-map.c |
diffstat | 3 files changed, 20 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +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. + (ASSERT): Remove macro. + (main): Make C90 compliant by avoiding variable declaration after + statement. + * modules/ino-map-tests (Files): Add tests/macros.h. + 2011-02-08 Jim Meyering <meyering@redhat.com> di-set: add "const" to a cast
--- a/modules/ino-map-tests +++ b/modules/ino-map-tests @@ -1,5 +1,6 @@ Files: tests/test-ino-map.c +tests/macros.h Depends-on:
--- a/tests/test-ino-map.c +++ b/tests/test-ino-map.c @@ -17,25 +17,11 @@ /* Written by Jim Meyering. */ #include <config.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -/* FIXME: once/if in gnulib, use #include "macros.h" in place of this */ -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) #include "ino-map.h" +#include "macros.h" + int main () { @@ -50,11 +36,13 @@ ASSERT (ino_map_insert (ino_map, 0) == INO_MAP_INIT + 2); ASSERT (ino_map_insert (ino_map, 0) == INO_MAP_INIT + 2); - int i; - for (i = 0; i < 100; i++) - { - ASSERT (ino_map_insert (ino_map, 10000 + i) == INO_MAP_INIT + 3 + i); - } + { + int i; + for (i = 0; i < 100; i++) + { + ASSERT (ino_map_insert (ino_map, 10000 + i) == INO_MAP_INIT + 3 + i); + } + } ino_map_free (ino_map);