tests: When tracing is enabled, output the todo tests too.

This commit is contained in:
Alexandre Julliard 2009-02-19 14:56:34 +01:00
parent 5c8c151aa8
commit d55bdc01d9
1 changed files with 16 additions and 14 deletions

View File

@ -258,29 +258,31 @@ int winetest_vok( int condition, const char *msg, va_list args )
{ {
if (condition) 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 ); data->current_file, data->current_line );
if (msg[0]) vfprintf(stdout, msg, args);
{
fprintf(stdout,": ");
vfprintf(stdout, msg, args);
}
InterlockedIncrement(&todo_failures); InterlockedIncrement(&todo_failures);
return 0; return 0;
} }
else InterlockedIncrement(&todo_successes); else
{
if (winetest_debug > 0)
{
fprintf( stdout, "%s:%d: Test marked todo: ",
data->current_file, data->current_line );
vfprintf(stdout, msg, args);
}
InterlockedIncrement(&todo_successes);
return 1;
}
} }
else else
{ {
if (!condition) if (!condition)
{ {
fprintf( stdout, "%s:%d: Test failed", fprintf( stdout, "%s:%d: Test failed: ",
data->current_file, data->current_line ); data->current_file, data->current_line );
if (msg[0]) vfprintf(stdout, msg, args);
{
fprintf( stdout,": ");
vfprintf(stdout, msg, args);
}
InterlockedIncrement(&failures); InterlockedIncrement(&failures);
return 0; return 0;
} }
@ -290,9 +292,9 @@ int winetest_vok( int condition, const char *msg, va_list args )
fprintf( stdout, "%s:%d: Test succeeded\n", fprintf( stdout, "%s:%d: Test succeeded\n",
data->current_file, data->current_line); data->current_file, data->current_line);
InterlockedIncrement(&successes); InterlockedIncrement(&successes);
return 1;
} }
} }
return 1;
} }
int winetest_ok( int condition, const char *msg, ... ) int winetest_ok( int condition, const char *msg, ... )