X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftest.c;h=c186bc5c11627eac5be5564061ad3b3e218ca3d3;hp=b39d22140b09f189b39a7bc40f2ce3da5c947f83;hb=8be4cad726760fbc18b83b1ae8af3790dcf31c81;hpb=5c35a542079457f2f5bcb9f367d6c449a2879822

diff --git a/src/test.c b/src/test.c
index b39d221..c186bc5 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: test.c,v 1.9 2006-07-07 06:59:49 adam Exp $
  */
 
 /** \file test.c
@@ -26,11 +24,12 @@
 static FILE *test_fout = 0; /* can't use '= stdout' on some systems */
 static int test_total = 0;
 static int test_failed = 0;
+static int test_todo = 0;
 static int test_verbose = 1;
 static const char *test_prog = 0;
 static int log_tests = 0; 
 
-static FILE *get_file()
+static FILE *get_file(void)
 {
     if (test_fout)
         return test_fout;
@@ -113,26 +112,42 @@ void yaz_check_init_log(const char *argv0)
     char logfilename[2048];
     log_tests = 1; 
     sprintf(logfilename,"%s.log", progname(argv0) );
-    unlink(logfilename);
     yaz_log_init_file(logfilename);
     yaz_log_trunc();
 
 }
 
+void  yaz_check_inc_todo(void)
+{
+    test_todo++;
+}
+
 void yaz_check_term1(void)
 {
     /* summary */
     if (test_failed)
     {
-        if (test_verbose >= 1)
-            fprintf(get_file(), "%d out of %d tests failed for program %s\n",
+        if (test_verbose >= 1) {
+            if (test_todo)
+                fprintf(get_file(), "%d out of %d tests failed for program %s"
+                        " (%d TODO's remaining)\n",
+                    test_failed, test_total, test_prog,test_todo);
+            else
+                fprintf(get_file(), "%d out of %d tests failed for program %s\n",
                     test_failed, test_total, test_prog);
+        }
     }
     else
     {
-        if (test_verbose >= 2)
-            fprintf(get_file(), "%d tests passed for program %s\n",
+        if (test_verbose >= 2) {
+            if (test_todo)
+                fprintf(get_file(), "%d tests passed for program %s"
+                        " (%d TODO's remaining)\n",
+                    test_total, test_prog,test_todo);
+            else
+                fprintf(get_file(), "%d tests passed for program %s\n",
                     test_total, test_prog);
+        }
     }
     if (test_fout)
         fclose(test_fout);
@@ -176,13 +191,13 @@ void yaz_check_print1(int type, const char *file, int line,
     }
     if (printit)
     {
-        fprintf(get_file(), "%s:%d %s: ", file, line, msg);
+        fprintf(get_file(), "%s:%d: %s: ", file, line, msg);
         fprintf(get_file(), "%s\n", expr);
     }
     if (log_tests)
     {
         yaz_log(YLOG_LOG, "%s:%d %s: ", file, line, msg);
-        yaz_log(YLOG_LOG, "%s\n", expr);
+        yaz_log(YLOG_LOG, "%s", expr);
     }
 }
 
@@ -195,6 +210,7 @@ int yaz_test_get_verbosity()
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab