Alexandre Julliard : tests: When tracing is enabled, output the todo tests too.
Alexandre Julliard
julliard at winehq.org
Thu Feb 19 09:18:47 CST 2009
Module: wine
Branch: master
Commit: d55bdc01d9b58d650089e0c66b21175b08ffdd2e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bdc01d9b58d650089e0c66b21175b08ffdd2e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 19 14:56:34 2009 +0100
tests: When tracing is enabled, output the todo tests too.
---
include/wine/test.h | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/include/wine/test.h b/include/wine/test.h
index caa3f35..a8f6f03 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -258,29 +258,31 @@ int winetest_vok( int condition, const char *msg, va_list args )
{
if (condition)
{
- fprintf( stdout, "%s:%d: Test succeeded inside todo block",
+ fprintf( stdout, "%s:%d: Test succeeded inside todo block: ",
data->current_file, data->current_line );
- if (msg[0])
+ vfprintf(stdout, msg, args);
+ InterlockedIncrement(&todo_failures);
+ return 0;
+ }
+ else
+ {
+ if (winetest_debug > 0)
{
- fprintf(stdout,": ");
+ fprintf( stdout, "%s:%d: Test marked todo: ",
+ data->current_file, data->current_line );
vfprintf(stdout, msg, args);
}
- InterlockedIncrement(&todo_failures);
- return 0;
+ InterlockedIncrement(&todo_successes);
+ return 1;
}
- else InterlockedIncrement(&todo_successes);
}
else
{
if (!condition)
{
- fprintf( stdout, "%s:%d: Test failed",
+ fprintf( stdout, "%s:%d: Test failed: ",
data->current_file, data->current_line );
- if (msg[0])
- {
- fprintf( stdout,": ");
- vfprintf(stdout, msg, args);
- }
+ vfprintf(stdout, msg, args);
InterlockedIncrement(&failures);
return 0;
}
@@ -290,9 +292,9 @@ int winetest_vok( int condition, const char *msg, va_list args )
fprintf( stdout, "%s:%d: Test succeeded\n",
data->current_file, data->current_line);
InterlockedIncrement(&successes);
+ return 1;
}
}
- return 1;
}
int winetest_ok( int condition, const char *msg, ... )
More information about the wine-cvs
mailing list