[PATCH] include: Print context information after the failure/todo messages.
Zebediah Figura
z.figura12 at gmail.com
Sun May 16 23:01:18 CDT 2021
The TestBot expects the failure text to directly follow the line number.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
include/wine/test.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/wine/test.h b/include/wine/test.h
index f2aacaff592..67774b1746a 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -303,11 +303,8 @@ const char *winetest_elapsed(void)
static void winetest_vprintf( const char *msg, __winetest_va_list args )
{
struct tls_data *data = get_tls_data();
- unsigned int i;
printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() );
- for (i = 0; i < data->context_count; ++i)
- printf( "%s: ", data->context[i] );
vprintf( msg, args );
}
@@ -366,12 +363,15 @@ static LONG winetest_add_line( void )
int winetest_vok( int condition, const char *msg, __winetest_va_list args )
{
struct tls_data *data = get_tls_data();
+ unsigned int i;
if (data->todo_level)
{
if (condition)
{
winetest_printf( "Test succeeded inside todo block: " );
+ for (i = 0; i < data->context_count; ++i)
+ printf( "%s: ", data->context[i] );
vprintf(msg, args);
InterlockedIncrement(&todo_failures);
return 0;
@@ -384,6 +384,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
if (winetest_debug > 0)
{
winetest_printf( "Test marked todo: " );
+ for (i = 0; i < data->context_count; ++i)
+ printf( "%s: ", data->context[i] );
vprintf(msg, args);
}
InterlockedIncrement(&todo_successes);
@@ -398,6 +400,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
if (!condition)
{
winetest_printf( "Test failed: " );
+ for (i = 0; i < data->context_count; ++i)
+ printf( "%s: ", data->context[i] );
vprintf(msg, args);
InterlockedIncrement(&failures);
return 0;
--
2.30.2
More information about the wine-devel
mailing list