projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'unistr/u16-strcoll'.
[gnulib.git]
/
tests
/
test-avltree_oset.c
diff --git
a/tests/test-avltree_oset.c
b/tests/test-avltree_oset.c
index
bf4e94d
..
211c833
100644
(file)
--- a/
tests/test-avltree_oset.c
+++ b/
tests/test-avltree_oset.c
@@
-1,5
+1,5
@@
/* Test of ordered set data type implementation.
/* Test of ordered set data type implementation.
- Copyright (C) 2006-20
07
Free Software Foundation, Inc.
+ Copyright (C) 2006-20
10
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software: you can redistribute it and/or modify
@@
-19,12
+19,12
@@
#include "gl_avltree_oset.h"
#include "gl_avltree_oset.h"
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "gl_array_oset.h"
#include "progname.h"
#include <stdlib.h>
#include <string.h>
#include "gl_array_oset.h"
#include "progname.h"
+#include "macros.h"
extern void gl_avltree_oset_check_invariants (gl_oset_t set);
extern void gl_avltree_oset_check_invariants (gl_oset_t set);
@@
-34,17
+34,6
@@
static const char *objects[30] =
"p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
};
"p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
};
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- 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))]
@@
-83,6
+72,8
@@
main (int argc, char *argv[])
{
gl_oset_t set1, set2;
{
gl_oset_t set1, set2;
+ set_program_name (argv[0]);
+
/* Allow the user to provide a non-default random seed on the command line. */
if (argc > 1)
srand (atoi (argv[1]));
/* Allow the user to provide a non-default random seed on the command line. */
if (argc > 1)
srand (atoi (argv[1]));
@@
-93,10
+84,12
@@
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, NULL);
+ set1 = gl_oset_nx_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+ ASSERT (set1 != NULL);
/* Create set2. */
/* Create set2. */
- set2 = gl_oset_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+ set2 = gl_oset_nx_create_empty (GL_AVLTREE_OSET, (gl_setelement_compar_fn) strcmp, NULL);
+ ASSERT (set2 != NULL);
check_all (set1, set2);
check_all (set1, set2);
@@
-104,7
+97,7
@@
main (int argc, char *argv[])
for (i = 0; i < initial_size; i++)
{
const char *obj = RANDOM_OBJECT ();
for (i = 0; i < initial_size; i++)
{
const char *obj = RANDOM_OBJECT ();
- ASSERT (gl_oset_
add (set1, obj) == gl_oset
_add (set2, obj));
+ ASSERT (gl_oset_
nx_add (set1, obj) == gl_oset_nx
_add (set2, obj));
check_all (set1, set2);
}
check_all (set1, set2);
}
@@
-122,7
+115,7
@@
main (int argc, char *argv[])
case 1:
{
const char *obj = RANDOM_OBJECT ();
case 1:
{
const char *obj = RANDOM_OBJECT ();
- ASSERT (gl_oset_
add (set1, obj) == gl_oset
_add (set2, obj));
+ ASSERT (gl_oset_
nx_add (set1, obj) == gl_oset_nx
_add (set2, obj));
}
break;
case 2:
}
break;
case 2: