projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
caseproto: Disallow -1 elements in caseprotos.
[pspp]
/
tests
/
libpspp
/
range-set-test.c
diff --git
a/tests/libpspp/range-set-test.c
b/tests/libpspp/range-set-test.c
index c1fc708d503dc0e80d29b16c672e951f85b4ed76..254ad060d1c607280f288b0b04c5a334e2e5ff91 100644
(file)
--- a/
tests/libpspp/range-set-test.c
+++ b/
tests/libpspp/range-set-test.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2010, 2011
, 2012
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
@@
-38,7
+38,6
@@
#include <libpspp/compiler.h>
#include <libpspp/pool.h>
#include <libpspp/compiler.h>
#include <libpspp/pool.h>
-#include "xalloc.h"
\f
/* Exit with a failure code.
(Place a breakpoint on this function while debugging.) */
\f
/* Exit with a failure code.
(Place a breakpoint on this function while debugging.) */
@@
-129,7
+128,7
@@
prev_region (unsigned int pattern, unsigned int offset,
unsigned int i;
assert (offset <= UINT_BIT);
unsigned int i;
assert (offset <= UINT_BIT);
- for (i = offset; i-- > 0;
)
+ for (i = offset; i-- > 0;)
if (pattern & (1u << i))
{
*start = i;
if (pattern & (1u << i))
{
*start = i;
@@
-163,8
+162,7
@@
print_regions (const struct range_set *rs)
const struct range_set_node *node;
printf ("result:");
const struct range_set_node *node;
printf ("result:");
- for (node = range_set_first (rs); node != NULL;
- node = range_set_next (rs, node))
+ RANGE_SET_FOR_EACH (node, rs)
printf (" (%lu,%lu)",
range_set_node_get_start (node), range_set_node_get_end (node));
printf ("\n");
printf (" (%lu,%lu)",
range_set_node_get_start (node), range_set_node_get_end (node));
printf ("\n");
@@
-259,16
+257,16
@@
make_pattern (unsigned int pattern)
return rs;
}
return rs;
}
-/* Returns an unsigned int with bits OFS...OFS+
CNT
(exclusive)
+/* Returns an unsigned int with bits OFS...OFS+
N
(exclusive)
set to 1, other bits set to 0. */
static unsigned int
set to 1, other bits set to 0. */
static unsigned int
-bit_range (unsigned int ofs, unsigned int
cnt
)
+bit_range (unsigned int ofs, unsigned int
n
)
{
assert (ofs < UINT_BIT);
{
assert (ofs < UINT_BIT);
- assert (
cnt
<= UINT_BIT);
- assert (ofs +
cnt
<= UINT_BIT);
+ assert (
n
<= UINT_BIT);
+ assert (ofs +
n
<= UINT_BIT);
- return
cnt < UINT_BIT ? ((1u << cnt
) - 1) << ofs : UINT_MAX;
+ return
n < UINT_BIT ? ((1u << n
) - 1) << ofs : UINT_MAX;
}
\f
/* Tests inserting all possible patterns into all possible range
}
\f
/* Tests inserting all possible patterns into all possible range
@@
-280,12
+278,6
@@
test_insert (void)
unsigned int init_pat;
int i, j;
unsigned int init_pat;
int i, j;
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && __llvm__
- /* This test seems to trigger a bug in llvm-gcc 4.2 on Mac OS X 10.8.0.
- Exit code 77 tells the Autotest framework that the test was skipped. */
- exit (77);
-#endif
-
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (i = 0; i < positions + 1; i++)
for (j = i; j <= positions + 1; j++)
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (i = 0; i < positions + 1; i++)
for (j = i; j <= positions + 1; j++)
@@
-313,12
+305,6
@@
test_delete (void)
unsigned int init_pat;
int i, j;
unsigned int init_pat;
int i, j;
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && __llvm__
- /* This test seems to trigger a bug in llvm-gcc 4.2 on Mac OS X 10.8.0.
- Exit code 77 tells the Autotest framework that the test was skipped. */
- exit (77);
-#endif
-
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (i = 0; i < positions + 1; i++)
for (j = i; j <= positions + 1; j++)
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (i = 0; i < positions + 1; i++)
for (j = i; j <= positions + 1; j++)
@@
-343,12
+329,6
@@
test_allocate (void)
unsigned int init_pat;
int request;
unsigned int init_pat;
int request;
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && __llvm__
- /* This test seems to trigger a bug in llvm-gcc 4.2 on Mac OS X 10.8.0.
- Exit code 77 tells the Autotest framework that the test was skipped. */
- exit (77);
-#endif
-
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (request = 1; request <= positions + 1; request++)
{
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (request = 1; request <= positions + 1; request++)
{
@@
-399,12
+379,6
@@
test_allocate_fully (void)
unsigned int init_pat;
int request;
unsigned int init_pat;
int request;
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && __llvm__
- /* This test seems to trigger a bug in llvm-gcc 4.2 on Mac OS X 10.8.0.
- Exit code 77 tells the Autotest framework that the test was skipped. */
- exit (77);
-#endif
-
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (request = 1; request <= positions + 1; request++)
{
for (init_pat = 0; init_pat < (1u << positions); init_pat++)
for (request = 1; request <= positions + 1; request++)
{