projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'thread'.
[gnulib.git]
/
tests
/
test-avltree_oset.c
diff --git
a/tests/test-avltree_oset.c
b/tests/test-avltree_oset.c
index
02066f6
..
7af78e0
100644
(file)
--- a/
tests/test-avltree_oset.c
+++ b/
tests/test-avltree_oset.c
@@
-1,11
+1,11
@@
/* Test of ordered set data type implementation.
/* Test of ordered set data type implementation.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
Written by Bruno Haible <bruno@clisp.org>, 2006.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,18
+13,18
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+#include "gl_avltree_oset.h"
+
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "gl_array_oset.h"
#include <stdlib.h>
#include <string.h>
#include "gl_array_oset.h"
-#include "
gl_avltree_oset
.h"
+#include "
progname
.h"
extern void gl_avltree_oset_check_invariants (gl_oset_t set);
extern void gl_avltree_oset_check_invariants (gl_oset_t set);
@@
-35,7
+35,17
@@
static const char *objects[30] =
};
#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
};
#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(condition) if (!(condition)) abort ()
+#define ASSERT(expr) \
+ do \
+ { \
+ if (!(expr)) \
+ { \
+ fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ fflush (stderr); \
+ abort (); \
+ } \
+ } \
+ while (0)
#define RANDOM(n) (rand () % (n))
#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
#define RANDOM(n) (rand () % (n))
#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
@@
-84,10
+94,10
@@
main (int argc, char *argv[])
unsigned int repeat;
/* Create set1. */
unsigned int repeat;
/* Create set1. */
- set1 = gl_oset_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp);
+ set1 = gl_oset_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp
, NULL
);
/* Create set2. */
/* Create set2. */
- set2 = gl_oset_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp);
+ set2 = gl_oset_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp
, NULL
);
check_all (set1, set2);
check_all (set1, set2);