From 04c8abb28e66baeaf6fa12743744bcd72238e3a3 Mon Sep 17 00:00:00 2001
From: Marek Vavrusa <marek@vavrusa.com>
Date: Tue, 19 Oct 2010 12:49:13 +0200
Subject: [PATCH] Fixed note() in libtap and updated src/tests/main.c
---
src/tests/libtap/tap.c | 3 ++-
src/tests/main.c | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/tests/libtap/tap.c b/src/tests/libtap/tap.c
index 05e08efc8..ea125f4dd 100644
--- a/src/tests/libtap/tap.c
+++ b/src/tests/libtap/tap.c
@@ -183,6 +183,7 @@ diag (const char *fmt, ...) {
int
note (const char *fmt, ...) {
+
va_list args;
va_start(args, fmt);
int len = vsnprintf(NULL, 0, fmt, args);
@@ -201,7 +202,7 @@ note (const char *fmt, ...) {
char* begin = buf;
char* end = strchr(begin, '\n');
for(;;) {
- fprintf(stdout, "# ");
+ fprintf(stderr, "# ");
if(end == NULL) {
end = buf + len;
write(fileno(stdout), begin, end - begin + 1);
diff --git a/src/tests/main.c b/src/tests/main.c
index ca535dbd6..89191c871 100644
--- a/src/tests/main.c
+++ b/src/tests/main.c
@@ -4,6 +4,7 @@
// Units to test
#include "server_tests.c"
#include "skiplist_tests.c"
+#include "da_tests.c"
// Run all loaded units
int main(int argc, char * argv[])
@@ -12,14 +13,16 @@ int main(int argc, char * argv[])
unit_api* tests[] = {
&server_tests_api, //! Server unit
&skiplist_tests_api, //! Skip list unit
+ &da_tests_api, //! Dynamic array unit
NULL
};
// Plan number of tests
int id = 0;
int test_count = 0;
+ note("Units:");
while(tests[id] != NULL) {
- fprintf(stderr, "#test %s : %d tests\n", tests[id]->name, tests[id]->count(argc, argv));
+ note("- %s : %d tests", tests[id]->name, tests[id]->count(argc, argv));
test_count += tests[id]->count(argc, argv);
++id;
}
--
GitLab