-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 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
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;
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);
}
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);
}
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab