X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Fsparse-array-test.c;h=dd0e95fbf3e720b9c52bc98baef4ddda1d5c754b;hb=refs%2Fheads%2Fpivot-table2;hp=9f63181b6daf3d2c39a0ac483b28bc809002dcd8;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp diff --git a/tests/libpspp/sparse-array-test.c b/tests/libpspp/sparse-array-test.c index 9f63181b6d..dd0e95fbf3 100644 --- a/tests/libpspp/sparse-array-test.c +++ b/tests/libpspp/sparse-array-test.c @@ -1,26 +1,25 @@ -/* PSPP - computes sample statistics. - Copyright (C) 2007 Free Software Foundation, Inc. +/* PSPP - a program for statistical analysis. + Copyright (C) 2007, 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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 . */ /* This is a test program for the sparse array routines defined in sparse-array.c. This test program aims to be as comprehensive as possible. "gcov -b" should report 100% coverage of lines and branches in sparse-array.c when compiled - with -DNDEBUG. "valgrind --leak-check=yes + with -DNDEBUG and BITS_PER_LEVEL is greater than the number of + bits in a long. "valgrind --leak-check=yes --show-reachable=yes" should give a clean report. */ #ifdef HAVE_CONFIG_H @@ -41,9 +40,6 @@ #define UNUSED #endif -/* Currently running test. */ -static const char *test_name; - /* Exit with a failure code. (Place a breakpoint on this function while debugging.) */ static void @@ -59,8 +55,7 @@ check_func (bool ok, int line) { if (!ok) { - printf ("%s:%d: Check failed in %s test\n", - __FILE__, line, test_name); + fprintf (stderr, "%s:%d: check failed\n", __FILE__, line); check_die (); } } @@ -166,8 +161,8 @@ check_sparse_array (struct sparse_array *spar, check (!sparse_array_remove (spar, order[cnt - 1] + 1)); } - for (i = 0, p = sparse_array_scan (spar, NULL, &idx); i < cnt; - i++, p = sparse_array_scan (spar, &idx, &idx)) + for (i = 0, p = sparse_array_first (spar, &idx); i < cnt; + i++, p = sparse_array_next (spar, idx, &idx)) { check (p != NULL); check (idx == order[i]); @@ -175,6 +170,15 @@ check_sparse_array (struct sparse_array *spar, } check (p == NULL); + for (i = 0, p = sparse_array_last (spar, &idx); i < cnt; + i++, p = sparse_array_prev (spar, idx, &idx)) + { + check (p != NULL); + check (idx == order[cnt - i - 1]); + check (*p == order[cnt - i - 1]); + } + check (p == NULL); + free (order); } @@ -280,6 +284,7 @@ test_insert_delete_strides (void) deletions = xnmalloc (cnt, sizeof *deletions); for (stride = strides; stride < strides + stride_cnt; stride++) { + printf ("%lu\n", *stride); for (offset = offsets; offset < offsets + offset_cnt; offset++) { int k; @@ -298,8 +303,6 @@ test_insert_delete_strides (void) test_insert_delete (insertions, insertions, cnt); test_insert_delete (insertions, deletions, cnt); } - putchar ('.'); - fflush (stdout); } free (insertions); free (deletions); @@ -420,27 +423,62 @@ test_random_insert_delete (void) sparse_array_destroy (spar); free (has_values); } - + /* Main program. */ -/* Runs TEST_FUNCTION and prints a message about NAME. */ -static void -run_test (void (*test_function) (void), const char *name) -{ - test_name = name; - putchar ('.'); - fflush (stdout); - test_function (); -} +struct test + { + const char *name; + const char *description; + void (*function) (void); + }; + +static const struct test tests[] = + { + { + "random-insert-delete", + "random insertions and deletions", + test_random_insert_delete + }, + { + "insert-delete-strides", + "insert in ascending order with strides and offset", + test_insert_delete_strides + }, + }; + +enum { N_TESTS = sizeof tests / sizeof *tests }; int -main (void) +main (int argc, char *argv[]) { - run_test (test_random_insert_delete, - "random insertions and deletions"); - run_test (test_insert_delete_strides, - "insert in ascending order with strides and offset"); - putchar ('\n'); + int i; - return 0; + if (argc != 2) + { + fprintf (stderr, "exactly one argument required; use --help for help\n"); + return EXIT_FAILURE; + } + else if (!strcmp (argv[1], "--help")) + { + printf ("%s: test sparse array library\n" + "usage: %s TEST-NAME\n" + "where TEST-NAME is one of the following:\n", + argv[0], argv[0]); + for (i = 0; i < N_TESTS; i++) + printf (" %s\n %s\n", tests[i].name, tests[i].description); + return 0; + } + else + { + for (i = 0; i < N_TESTS; i++) + if (!strcmp (argv[1], tests[i].name)) + { + tests[i].function (); + return 0; + } + + fprintf (stderr, "unknown test %s; use --help for help\n", argv[1]); + return EXIT_FAILURE; + } }