removed redundant #include

[pspp-builds.git] / tests / libpspp / llx-test.c

diff --git a/tests/libpspp/llx-test.c b/tests/libpspp/llx-test.c
index 0de38b02c80ade4f731b3e45846b8251ffa1d2e4..f825a3a420242f30691a071c471c7097589f2a1c 100644 (file)
--- a/tests/libpspp/llx-test.c
+++ b/tests/libpspp/llx-test.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -28,6 +27,10 @@
 
    See ll-test.c for a similar program for the ll_* routines. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <libpspp/llx.h>
 #include <assert.h>
 #include <stdio.h>
@@ -41,6 +44,9 @@
 #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
@@ -56,7 +62,8 @@ check_func (bool ok, int line)
 {
   if (!ok) 
     {
-      printf ("check failed at %s, line %d\n", __FILE__, line);
+      printf ("Check failed in %s test at %s, line %d\n",
+              test_name, __FILE__, line);
       check_die ();
     }
 }
@@ -222,7 +229,7 @@ static bool
 pattern_pred (const void *element_, void *pattern_) 
 {
   const struct element *element = element_;
-  unsigned *pattern = pattern_;
+  unsigned int *pattern = pattern_;
 
   return (*pattern & (1u << element->x)) != 0;
 }
@@ -1004,10 +1011,10 @@ test_count_if (void)
 }
 
 /* Returns N!. */
-static unsigned
-factorial (unsigned n) 
+static unsigned int
+factorial (unsigned int n) 
 {
-  unsigned value = 1;
+  unsigned int value = 1;
   while (n > 1)
     value *= n--;
   return value;
@@ -1016,11 +1023,11 @@ factorial (unsigned n)
 /* Returns the number of permutations of the CNT values in
    VALUES.  If VALUES contains duplicates, they must be
    adjacent. */
-static unsigned
+static unsigned int
 expected_perms (int *values, size_t cnt) 
 {
   size_t i, j;
-  unsigned perm_cnt;
+  unsigned int perm_cnt;
   
   perm_cnt = factorial (cnt);
   for (i = 0; i < cnt; i = j) 
@@ -1359,7 +1366,7 @@ test_permutations_with_dups (void)
         int *old_values = xnmalloc (max_elems, sizeof *values);
         int *new_values = xnmalloc (max_elems, sizeof *values);
 
-        unsigned permutation_cnt;
+        unsigned int permutation_cnt;
         int left = cnt;
         int value = 0;
       
@@ -1926,7 +1933,7 @@ test_partition (void)
   const int max_elems = 10;
   
   int cnt;
-  unsigned pbase;
+  unsigned int pbase;
   int r0, r1;
 
   for (cnt = 0; cnt < max_elems; cnt++)
@@ -1939,7 +1946,7 @@ test_partition (void)
             struct llx **elemp;
             int *values;
 
-            unsigned pattern = pbase << r0;
+            unsigned int pattern = pbase << r0;
             int i, j;
             int first_false;
             struct llx *part_llx;
@@ -2018,10 +2025,10 @@ test_allocation_failure (void)
 static void
 run_test (void (*test_function) (void), const char *name) 
 {
-  printf ("Running %s test...  ", name);
+  test_name = name;
+  putchar ('.');
   fflush (stdout);
   test_function ();
-  printf ("done.\n");
 }
 
 int
@@ -2058,6 +2065,7 @@ main (void)
   run_test (test_insert_ordered, "insert_ordered");
   run_test (test_partition, "partition");
   run_test (test_allocation_failure, "allocation failure");
+  putchar ('\n');
 
   return 0;
 }