heap: Convert tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 67452df4513dc370feceb5f41449f58a8feddeb7..057289fefd6df0ed42863c7a556f6229dd2bf1a0 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/heap-test \
        tests/libpspp/hmap-test \
        tests/libpspp/hmapx-test \
        tests/libpspp/ll-test \
@@ -169,6 +168,7 @@ check_PROGRAMS += \
        tests/formats/inexactify \
        tests/libpspp/abt-test \
        tests/libpspp/bt-test \
+       tests/libpspp/heap-test \
        tests/libpspp/i18n-test \
        tests/libpspp/sparse-xarray-test \
        tests/output/render-test
@@ -420,6 +420,7 @@ TESTSUITE_AT = \
        tests/language/xforms/recode.at \
        tests/libpspp/abt.at \
        tests/libpspp/bt.at \
+       tests/libpspp/heap.at \
        tests/libpspp/i18n.at \
        tests/math/moments.at \
        tests/output/render.at \

diff --git a/tests/libpspp/heap-test.c b/tests/libpspp/heap-test.c
index b6717df44890ad09728117727e408c765f87d7a0..d042ab5c3860d8571da151bb97757f52d6912164 100644 (file)
--- a/tests/libpspp/heap-test.c
+++ b/tests/libpspp/heap-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"
 \f
-/* 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 ();
     }
 }
@@ -649,28 +645,74 @@ test_random_insert_delete (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-no-dups-delete-min",
+      "insert (no dups), delete minimum values",
+      test_insert_no_dups_delete_min
+    },
+    {
+      "insert-with-dups-delete-min",
+      "insert with dups, delete minimum values",
+      test_insert_with_dups_delete_min
+    },
+    {
+      "insert-no-dups-delete-random",
+      "insert (no dups), delete in random order",
+      test_insert_no_dups_delete_random
+    },
+    {
+      "inc-dec",
+      "increase and decrease values",
+      test_inc_dec
+    },
+    {
+      "random-insert-delete",
+      "random insertions and deletions",
+      test_random_insert_delete
+    }
+  };
+
+enum { N_TESTS = sizeof tests / sizeof *tests };
 
 int
-main (void)
+main (int argc, char *argv[])
 {
-  run_test (test_insert_no_dups_delete_min,
-            "insert (no dups), delete minimum values");
-  run_test (test_insert_with_dups_delete_min,
-            "insert with dups, delete minimum values");
-  run_test (test_insert_no_dups_delete_random,
-            "insert (no dups), delete in random order");
-  run_test (test_inc_dec, "increase and decrease values");
-  run_test (test_random_insert_delete, "random insertions and deletions");
-  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 heap 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/heap.at b/tests/libpspp/heap.at
new file mode 100644 (file)
index 0000000..14dd3a6
--- /dev/null
+++ b/tests/libpspp/heap.at
@@ -0,0 +1,12 @@
+AT_BANNER([Heap library])
+
+m4_define([CHECK_HEAP],
+  [AT_SETUP([heap -- $1])
+   AT_CHECK([heap-test $1])
+   AT_CLEANUP])
+
+CHECK_HEAP([insert-no-dups-delete-min])
+CHECK_HEAP([insert-with-dups-delete-min])
+CHECK_HEAP([insert-no-dups-delete-random])
+CHECK_HEAP([inc-dec])
+CHECK_HEAP([random-insert-delete])