Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINE/TEST] Add the possibility of making file names clickable in visual studio output windows by defining WINETEST_MSVC_IDE_FORMATTING. By Mark Jansen. ROSTESTS-156

Browse source 
svn path=/trunk/; revision=67172
This commit is contained in:
Amine Khaldi 2015-04-12 12:26:46 +00:00
parent c45766ee82
commit 744730996d
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/include/reactos/wine/test.h
View file

@ -205,6 +205,14 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... );
# define __winetest_va_end(list) va_end(list)
#endif
/* Define WINETEST_MSVC_IDE_FORMATTING to alter the output format winetest will use for file/line numbers.
This alternate format makes the file/line numbers clickable in visual studio, to directly jump to them. */
#if defined(WINETEST_MSVC_IDE_FORMATTING)
# define __winetest_file_line_prefix "%s(%d)"
#else
# define __winetest_file_line_prefix "%s:%d"
#endif
struct test
{
const char *name;
@ -294,6 +302,9 @@ static void exit_process( int code )
void winetest_set_location( const char* file, int line )
{
tls_data* data=get_tls_data();
#if defined(WINETEST_MSVC_IDE_FORMATTING)
data->current_file = file;
#else
data->current_file=strrchr(file,'/');
if (data->current_file==NULL)
data->current_file=strrchr(file,'\\');
@ -301,6 +312,7 @@ void winetest_set_location( const char* file, int line )
data->current_file=file;
else
data->current_file++;
#endif
data->current_line=line;
}
@ -331,7 +343,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
{
if (condition)
{
fprintf( stdout, "%s:%d: Test succeeded inside todo block: ",
fprintf( stdout, __winetest_file_line_prefix ": Test succeeded inside todo block: ",
data->current_file, data->current_line );
vfprintf(stdout, msg, args);
InterlockedIncrement(&todo_failures);
@ -342,7 +354,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
/* show todos even if traces are disabled*/
/*if (winetest_debug > 0)*/
{
fprintf( stdout, "%s:%d: Test marked todo: ",
fprintf( stdout, __winetest_file_line_prefix ": Test marked todo: ",
data->current_file, data->current_line );
vfprintf(stdout, msg, args);
}
@ -354,7 +366,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
{
if (!condition)
{
fprintf( stdout, "%s:%d: Test failed: ",
fprintf( stdout, __winetest_file_line_prefix ": Test failed: ",
data->current_file, data->current_line );
vfprintf(stdout, msg, args);
InterlockedIncrement(&failures);
@ -363,7 +375,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args )
else
{
if (report_success)
fprintf( stdout, "%s:%d: Test succeeded\n",
fprintf( stdout, __winetest_file_line_prefix ": Test succeeded\n",
data->current_file, data->current_line);
InterlockedIncrement(&successes);
return 1;
@ -387,7 +399,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... )
if (winetest_debug > 0)
{
fprintf( stdout, "%s:%d: ", data->current_file, data->current_line );
fprintf( stdout, __winetest_file_line_prefix ": ", data->current_file, data->current_line );
__winetest_va_start(valist, msg);
vfprintf(stdout, msg, valist);
__winetest_va_end(valist);
@ -398,7 +410,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args )
{
tls_data* data=get_tls_data();
fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line );
fprintf( stdout, __winetest_file_line_prefix ": Tests skipped: ", data->current_file, data->current_line );
vfprintf(stdout, msg, args);
skipped++;
}