range-set: Convert tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 4766ae10d807b2f33a6f51fd28efaf804fd73652..8c8b9d4bf8217044f206170bce2502d91dac37d5 100644 (file)
--- 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-set-test \
        tests/libpspp/sparse-array-test \
        tests/libpspp/str-test \
        tests/libpspp/string-map-test \
@@ -170,6 +169,7 @@ check_PROGRAMS += \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
+       tests/libpspp/range-set-test \
        tests/libpspp/sparse-xarray-test \
        tests/output/render-test
 
@@ -427,6 +427,7 @@ TESTSUITE_AT = \
        tests/libpspp/ll.at \
        tests/libpspp/llx.at \
        tests/libpspp/range-map.at \
+       tests/libpspp/range-set.at \
        tests/math/moments.at \
        tests/output/render.at \
        tests/output/charts.at \

diff --git a/tests/libpspp/range-set-test.c b/tests/libpspp/range-set-test.c
index 8d6e68316834d707254b5888f92d1b41b1064bb6..03dfb3189e18db2af7798ba1d94fead53e3ec2e7 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.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   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
@@ -40,9 +40,6 @@
 
 #include "xalloc.h"
 \f
-/* 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 +55,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 ();
     }
 }
@@ -462,26 +458,79 @@ test_destroy_null (void)
 \f
 /* 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;
+    }
 }

diff --git a/tests/libpspp/range-set.at b/tests/libpspp/range-set.at
new file mode 100644 (file)
index 0000000..35eed8c
--- /dev/null
+++ b/tests/libpspp/range-set.at
@@ -0,0 +1,13 @@
+AT_BANNER([range set library])
+
+m4_define([CHECK_RANGE_SET],
+  [AT_SETUP([range-set -- $1])
+   AT_CHECK([range-set-test $1])
+   AT_CLEANUP])
+
+CHECK_RANGE_SET([insert])
+CHECK_RANGE_SET([delete])
+CHECK_RANGE_SET([allocate])
+CHECK_RANGE_SET([allocate-fully])
+CHECK_RANGE_SET([pool])
+CHECK_RANGE_SET([destroy-null])