X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flibpspp%2Frange-set-test.c;h=254ad060d1c607280f288b0b04c5a334e2e5ff91;hb=refs%2Fheads%2Fctables10;hp=e8cbffa5e6334408bbd69dc4c7c2a7e9dbb72829;hpb=29eec4ed65faec40e628474ba759899d7aaf9762;p=pspp diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c index e8cbffa5e6..254ad060d1 100644 --- a/tests/libpspp/range-set-test.c +++ b/tests/libpspp/range-set-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 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 @@ -38,11 +38,7 @@ #include #include -#include "xalloc.h" -/* Currently running test. */ -static const char *test_name; - /* Exit with a failure code. (Place a breakpoint on this function while debugging.) */ static void @@ -58,8 +54,7 @@ check_func (bool ok, int line) { if (!ok) { - printf ("Check failed in %s test at %s, line %d\n", - test_name, __FILE__, line); + fprintf (stderr, "%s:%d: check failed\n", __FILE__, line); check_die (); } } @@ -133,7 +128,7 @@ prev_region (unsigned int pattern, unsigned int offset, unsigned int i; assert (offset <= UINT_BIT); - for (i = offset; i-- > 0; ) + for (i = offset; i-- > 0;) if (pattern & (1u << i)) { *start = i; @@ -167,8 +162,7 @@ print_regions (const struct range_set *rs) 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"); @@ -212,7 +206,7 @@ check_pattern (const struct range_set *rs, unsigned int pattern) caching. */ for (start = 0; start <= 32; start++) { - struct range_set *nonconst_rs = (struct range_set *) rs; + struct range_set *nonconst_rs = CONST_CAST (struct range_set *, rs); nonconst_rs->cache_end = 0; s1 = range_set_scan (rs, start); s2 = next_1bit (pattern, start); @@ -258,21 +252,21 @@ make_pattern (unsigned int pattern) unsigned long int width = 0; struct range_set *rs = range_set_create_pool (NULL); while (next_region (pattern, start + width, &start, &width)) - range_set_insert (rs, start, width); + range_set_set1 (rs, start, width); check_pattern (rs, pattern); 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 -bit_range (unsigned int ofs, unsigned int cnt) +bit_range (unsigned int ofs, unsigned int n) { 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; } /* Tests inserting all possible patterns into all possible range @@ -292,7 +286,7 @@ test_insert (void) unsigned int final_pat; rs = make_pattern (init_pat); - range_set_insert (rs, i, j - i); + range_set_set1 (rs, i, j - i); final_pat = init_pat | bit_range (i, j - i); check_pattern (rs, final_pat); rs2 = range_set_clone (rs, NULL); @@ -319,7 +313,7 @@ test_delete (void) unsigned int final_pat; rs = make_pattern (init_pat); - range_set_delete (rs, i, j - i); + range_set_set0 (rs, i, j - i); final_pat = init_pat & ~bit_range (i, j - i); check_pattern (rs, final_pat); range_set_destroy (rs); @@ -441,7 +435,7 @@ test_pool (void) Makes sure that this doesn't cause a double-free. */ pool = pool_create (); rs = range_set_create_pool (pool); - range_set_insert (rs, 1, 10); + range_set_set1 (rs, 1, 10); range_set_destroy (rs); pool_destroy (pool); @@ -449,7 +443,7 @@ test_pool (void) Makes sure that this doesn't cause a leak. */ pool = pool_create (); rs = range_set_create_pool (pool); - range_set_insert (rs, 1, 10); + range_set_set1 (rs, 1, 10); pool_destroy (pool); } @@ -462,26 +456,79 @@ test_destroy_null (void) /* 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[] = + { + { + "insert", + "insert", + test_insert + }, + { + "delete", + "delete", + test_delete + }, + { + "allocate", + "allocate", + test_allocate + }, + { + "allocate-fully", + "allocate_fully", + test_allocate_fully + }, + { + "pool", + "pool", + test_pool + }, + { + "destroy-null", + "destroy null", + test_destroy_null + }, + }; + +enum { N_TESTS = sizeof tests / sizeof *tests }; int -main (void) +main (int argc, char *argv[]) { - run_test (test_insert, "insert"); - run_test (test_delete, "delete"); - run_test (test_allocate, "allocate"); - run_test (test_allocate_fully, "allocate_fully"); - run_test (test_pool, "pool"); - run_test (test_destroy_null, "destroy null"); - putchar ('\n'); - - return 0; + int i; + + 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 range set 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; + } }