From: Ben Pfaff Date: Sat, 25 Sep 2010 21:31:48 +0000 (-0700) Subject: range-map: Convert tests to use Autotest. X-Git-Tag: v0.7.6~170 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f925013e483c6421262435b98ee0e2ff2a9ebd6;p=pspp-builds.git range-map: Convert tests to use Autotest. --- diff --git a/tests/automake.mk b/tests/automake.mk index 7146f1c7..4766ae10 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -146,7 +146,6 @@ dist_TESTS += tests/command/get-data-psql.sh endif nodist_TESTS = \ - tests/libpspp/range-map-test \ tests/libpspp/range-set-test \ tests/libpspp/sparse-array-test \ tests/libpspp/str-test \ @@ -170,6 +169,7 @@ check_PROGRAMS += \ tests/libpspp/i18n-test \ tests/libpspp/ll-test \ tests/libpspp/llx-test \ + tests/libpspp/range-map-test \ tests/libpspp/sparse-xarray-test \ tests/output/render-test @@ -426,6 +426,7 @@ TESTSUITE_AT = \ tests/libpspp/i18n.at \ tests/libpspp/ll.at \ tests/libpspp/llx.at \ + tests/libpspp/range-map.at \ tests/math/moments.at \ tests/output/render.at \ tests/output/charts.at \ diff --git a/tests/libpspp/range-map-test.c b/tests/libpspp/range-map-test.c index c2133770..b6a1b493 100644 --- a/tests/libpspp/range-map-test.c +++ b/tests/libpspp/range-map-test.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -39,9 +39,6 @@ #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 @@ -57,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 (); } } @@ -491,23 +487,64 @@ test_delete_gaps (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-contiguous", + "delete from contiguous ranges", + test_delete_contiguous + }, + { + "delete-gaps", + "delete from ranges separated by gaps", + test_delete_gaps + }, + }; + +enum { N_TESTS = sizeof tests / sizeof *tests }; int -main (void) +main (int argc, char *argv[]) { - run_test (test_insert, "insert"); - run_test (test_delete_contiguous, "delete from contiguous ranges"); - run_test (test_delete_gaps, "delete from ranges separated by gaps"); - 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 range map 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; + } } diff --git a/tests/libpspp/range-map.at b/tests/libpspp/range-map.at new file mode 100644 index 00000000..d414f50a --- /dev/null +++ b/tests/libpspp/range-map.at @@ -0,0 +1,10 @@ +AT_BANNER([range map library]) + +m4_define([CHECK_RANGE_MAP], + [AT_SETUP([range-map -- $1]) + AT_CHECK([range-map-test $1]) + AT_CLEANUP]) + +CHECK_RANGE_MAP([insert]) +CHECK_RANGE_MAP([delete-contiguous]) +CHECK_RANGE_MAP([delete-gaps])