sparse-array: Convert tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 8c8b9d4bf8217044f206170bce2502d91dac37d5..516949dd8e737ffcc319f5f2fffe244028c0070f 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/sparse-array-test \
        tests/libpspp/str-test \
        tests/libpspp/string-map-test \
        tests/libpspp/stringi-map-test \
@@ -170,6 +169,7 @@ check_PROGRAMS += \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
        tests/libpspp/range-set-test \
+       tests/libpspp/sparse-array-test \
        tests/libpspp/sparse-xarray-test \
        tests/output/render-test
 
@@ -428,6 +428,7 @@ TESTSUITE_AT = \
        tests/libpspp/llx.at \
        tests/libpspp/range-map.at \
        tests/libpspp/range-set.at \
+       tests/libpspp/sparse-array.at \
        tests/math/moments.at \
        tests/output/render.at \
        tests/output/charts.at \

diff --git a/tests/libpspp/sparse-array-test.c b/tests/libpspp/sparse-array-test.c
index e146c3dbf537b7c765dfec60a16267756f8b4356..dd0e95fbf3e720b9c52bc98baef4ddda1d5c754b 100644 (file)
--- a/tests/libpspp/sparse-array-test.c
+++ b/tests/libpspp/sparse-array-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 @@
 #define UNUSED
 #endif
 
-/* 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 ("%s:%d: Check failed in %s test\n",
-              __FILE__, line, test_name);
+      fprintf (stderr, "%s:%d: check failed\n", __FILE__, line);
       check_die ();
     }
 }
@@ -288,6 +284,7 @@ test_insert_delete_strides (void)
   deletions = xnmalloc (cnt, sizeof *deletions);
   for (stride = strides; stride < strides + stride_cnt; stride++)
     {
+      printf ("%lu\n", *stride);
       for (offset = offsets; offset < offsets + offset_cnt; offset++)
         {
           int k;
@@ -306,8 +303,6 @@ test_insert_delete_strides (void)
           test_insert_delete (insertions, insertions, cnt);
           test_insert_delete (insertions, deletions, cnt);
         }
-      putchar ('.');
-      fflush (stdout);
     }
   free (insertions);
   free (deletions);
@@ -428,27 +423,62 @@ test_random_insert_delete (void)
   sparse_array_destroy (spar);
   free (has_values);
 }
-
+\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[] =
+  {
+    {
+      "random-insert-delete",
+      "random insertions and deletions",
+      test_random_insert_delete
+    },
+    {
+      "insert-delete-strides",
+      "insert in ascending order with strides and offset",
+      test_insert_delete_strides
+    },
+  };
+
+enum { N_TESTS = sizeof tests / sizeof *tests };
 
 int
-main (void)
+main (int argc, char *argv[])
 {
-  run_test (test_random_insert_delete,
-            "random insertions and deletions");
-  run_test (test_insert_delete_strides,
-            "insert in ascending order with strides and offset");
-  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 sparse array 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/sparse-array.at b/tests/libpspp/sparse-array.at
new file mode 100644 (file)
index 0000000..ac2abef
--- /dev/null
+++ b/tests/libpspp/sparse-array.at
@@ -0,0 +1,30 @@
+AT_BANNER([sparse array library])
+
+m4_define([CHECK_SPARSE_ARRAY],
+  [AT_SETUP([sparse array -- $1])
+   AT_KEYWORDS([sparse-array])
+   AT_CHECK([sparse-array-test $1])
+   AT_CLEANUP])
+
+CHECK_SPARSE_ARRAY([random-insert-delete])
+
+AT_SETUP([sparse array -- insert and delete with strides])
+AT_KEYWORDS([sparse-array])
+AT_CHECK([sparse-array-test insert-delete-strides], [0], [dnl
+1
+2
+4
+16
+64
+4096
+262144
+16777216
+3
+5
+17
+67
+4099
+262147
+16777259
+])
+AT_CLEANUP