projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hmap-test: Disable ordered insert tests on GCC 4.3.
[pspp-builds.git]
/
tests
/
libpspp
/
hmap-test.c
diff --git
a/tests/libpspp/hmap-test.c
b/tests/libpspp/hmap-test.c
index 4ca7f92fd73f48316bcc53c1f388bfab69427a11..f9d963d83bca459067d6fbcaea96a3355089f665 100644
(file)
--- a/
tests/libpspp/hmap-test.c
+++ b/
tests/libpspp/hmap-test.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009
, 2010
Free Software Foundation, Inc.
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
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
@@
-342,6
+342,7
@@
check_hmap (struct hmap *hmap, const int data[], size_t cnt,
size_t i, j;
int *order;
size_t i, j;
int *order;
+ check (hmap_is_empty (hmap) == (cnt == 0));
check (hmap_count (hmap) == cnt);
check (cnt <= hmap_capacity (hmap));
check (hmap_count (hmap) == cnt);
check (cnt <= hmap_capacity (hmap));
@@
-378,7
+379,6
@@
check_hmap (struct hmap *hmap, const int data[], size_t cnt,
for (p = hmap_first (hmap), i = 0; i < cnt; p = hmap_next (hmap, p), i++)
{
struct element *e = hmap_node_to_element (p);
for (p = hmap_first (hmap), i = 0; i < cnt; p = hmap_next (hmap, p), i++)
{
struct element *e = hmap_node_to_element (p);
- size_t j;
check (hmap_node_hash (&e->node) == hash (e->data));
for (j = 0; j < left; j++)
check (hmap_node_hash (&e->node) == hash (e->data));
for (j = 0; j < left; j++)
@@
-666,6
+666,10
@@
test_insert_ordered (int max_elems, hash_function *hash)
struct hmap hmap;
int i;
struct hmap hmap;
int i;
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 3
+ return;
+#endif /* GCC 4.3 */
+
hmap_init (&hmap);
elements = xnmalloc (max_elems, sizeof *elements);
values = xnmalloc (max_elems, sizeof *values);
hmap_init (&hmap);
elements = xnmalloc (max_elems, sizeof *elements);
values = xnmalloc (max_elems, sizeof *values);