bt: Convert tests to use Autotest.

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

diff --git a/tests/libpspp/bt-test.c b/tests/libpspp/bt-test.c
index 2d59fb9a5dc0191d05704fadfde6eb792ff9aa89..42cfbeabef429044095ceeeb41b277065fb59aff 100644 (file)
--- a/tests/libpspp/bt-test.c
+++ b/tests/libpspp/bt-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
@@ -36,9 +36,6 @@
 
 #include <libpspp/compiler.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
@@ -54,8 +51,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 ();
     }
 }
@@ -704,33 +700,89 @@ test_changed (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-any-remove-any",
+      "insert any order, delete any order",
+      test_insert_any_remove_any
+    },
+    {
+      "insert-any-remove-same",
+      "insert any order, delete same order",
+      test_insert_any_remove_same
+    },
+    {
+      "insert-any-remove-reverse",
+      "insert any order, delete reverse order",
+      test_insert_any_remove_reverse
+    },
+    {
+      "random-sequence",
+      "insert and delete in random sequence",
+      test_random_sequence
+    },
+    {
+      "insert-ordered",
+      "insert in ascending order",
+      test_insert_ordered
+    },
+    {
+      "find-ge-le",
+      "find_ge and find_le",
+      test_find_ge_le
+    },
+      {
+      "moved",
+      "move elements around in memory",
+      test_moved
+    },
+    {
+      "changed",
+      "change key data in nodes",
+      test_changed
+    }
+  };
+
+enum { N_TESTS = sizeof tests / sizeof *tests };
 
 int
-main (void)
+main (int argc, char *argv[])
 {
-  run_test (test_insert_any_remove_any,
-            "insert any order, delete any order");
-  run_test (test_insert_any_remove_same,
-            "insert any order, delete same order");
-  run_test (test_insert_any_remove_reverse,
-            "insert any order, delete reverse order");
-  run_test (test_random_sequence,
-            "insert and delete in random sequence");
-  run_test (test_insert_ordered,
-            "insert in ascending order");
-  run_test (test_find_ge_le, "find_ge and find_le");
-  run_test (test_moved, "move elements around in memory");
-  run_test (test_changed, "change key data in nodes");
-  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 balanced tree\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/bt.at b/tests/libpspp/bt.at
new file mode 100644 (file)
index 0000000..62eb80f
--- /dev/null
+++ b/tests/libpspp/bt.at
@@ -0,0 +1,15 @@
+AT_BANNER([Balanced tree (BT) library])
+
+m4_define([CHECK_BT],
+  [AT_SETUP([BT -- $1])
+   AT_CHECK([bt-test $1])
+   AT_CLEANUP])
+
+CHECK_BT([insert-any-remove-any])
+CHECK_BT([insert-any-remove-same])
+CHECK_BT([insert-any-remove-reverse])
+CHECK_BT([random-sequence])
+CHECK_BT([insert-ordered])
+CHECK_BT([find-ge-le])
+CHECK_BT([moved])
+CHECK_BT([changed])