[Pspp-cvs] pspp/tests/libpspp ll-test.c llx-test.c ChangeLog

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/10/29 22:04:09

Modified files:
        tests/libpspp  : ll-test.c llx-test.c 
Added files:
        tests/libpspp  : ChangeLog 

Log message:
        Reduce verbosity of ll-test, llx-test output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/libpspp/ll-test.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/libpspp/llx-test.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/libpspp/ChangeLog?cvsroot=pspp&rev=1.1

Patches:
Index: ll-test.c
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/libpspp/ll-test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ll-test.c   1 Jul 2006 22:34:27 -0000       1.1
+++ ll-test.c   29 Oct 2006 22:04:09 -0000      1.2
@@ -42,6 +42,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
@@ -57,7 +60,8 @@
 {
   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 ();
     }
 }
@@ -1971,10 +1975,10 @@
 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
@@ -2010,6 +2014,7 @@
   run_test (test_sort_unique, "sort_unique");
   run_test (test_insert_ordered, "insert_ordered");
   run_test (test_partition, "partition");
+  putchar ('\n');
 
   return 0;
 }

Index: llx-test.c
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/libpspp/llx-test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- llx-test.c  1 Jul 2006 22:34:27 -0000       1.1
+++ llx-test.c  29 Oct 2006 22:04:09 -0000      1.2
@@ -41,6 +41,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 +59,8 @@
 {
   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 ();
     }
 }
@@ -2018,10 +2022,10 @@
 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 +2062,7 @@
   run_test (test_insert_ordered, "insert_ordered");
   run_test (test_partition, "partition");
   run_test (test_allocation_failure, "allocation failure");
+  putchar ('\n');
 
   return 0;
 }

Index: ChangeLog
===================================================================
RCS file: ChangeLog
diff -N ChangeLog
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ ChangeLog   29 Oct 2006 22:04:09 -0000      1.1
@@ -0,0 +1,9 @@
+Sun Oct 29 14:03:37 2006  Ben Pfaff  <address@hidden>
+
+       * ll-test.c, llx-test.c: Reduce verbosity of output.
+
+----------------------------------------------------------------------
+Local Variables:
+mode: change-log
+version-control: never
+End: