tower: Convert tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 9e6b90f05a85ebd89371d4e6c05dcaaf65b16132..772491dfb32a4d9939e930342b1065938951fec7 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -145,9 +145,6 @@ if PSQL_SUPPORT
 dist_TESTS += tests/command/get-data-psql.sh 
 endif
 
-nodist_TESTS = \
-       tests/libpspp/tower-test
-
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
@@ -171,6 +168,7 @@ check_PROGRAMS += \
        tests/libpspp/stringi-map-test \
        tests/libpspp/string-set-test \
        tests/libpspp/stringi-set-test \
+       tests/libpspp/tower-test \
        tests/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
@@ -434,6 +432,7 @@ TESTSUITE_AT = \
        tests/libpspp/stringi-map.at \
        tests/libpspp/string-set.at \
        tests/libpspp/stringi-set.at \
+       tests/libpspp/tower.at \
        tests/math/moments.at \
        tests/output/render.at \
        tests/output/charts.at \

diff --git a/tests/libpspp/tower-test.c b/tests/libpspp/tower-test.c
index c603c3a876a61ee2ce5e21815d93e6a8e829e1c6..f5c002652a4409af5f9ef834b2d3ca0dd2f3fe82 100644 (file)
--- a/tests/libpspp/tower-test.c
+++ b/tests/libpspp/tower-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 ();
     }
 }
@@ -677,25 +673,74 @@ test_splice_in (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
+    },
+    {
+      "resize",
+      "resize",
+      test_resize
+    },
+    {
+      "splice-out",
+      "splice out",
+      test_splice_out
+    },
+    {
+      "splice-in",
+      "splice in",
+      test_splice_in
+    },
+  };
+
+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_resize, "resize");
-  run_test (test_splice_out, "splice out");
-  run_test (test_splice_in, "splice in");
-  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 tower 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/tower.at b/tests/libpspp/tower.at
new file mode 100644 (file)
index 0000000..c4d6f82
--- /dev/null
+++ b/tests/libpspp/tower.at
@@ -0,0 +1,12 @@
+AT_BANNER([tower library])
+
+m4_define([CHECK_TOWER],
+  [AT_SETUP([tower -- $1])
+   AT_CHECK([tower-test $1])
+   AT_CLEANUP])
+
+CHECK_TOWER([insert])
+CHECK_TOWER([delete])
+CHECK_TOWER([resize])
+CHECK_TOWER([splice-out])
+CHECK_TOWER([splice-in])