[PATCH 0/2] MR3759: dinput/tests: Report the driver success and skipped tests counters.
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55535 --- dlls/dinput/tests/driver_hid.h | 6 ++++++ dlls/dinput/tests/hid.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 291cf8963c2..ee5d26cdbf7 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -98,8 +98,11 @@ struct winetest_shared_data int running_under_wine; int winetest_report_success; int winetest_debug; + LONG successes; LONG failures; + LONG todo_successes; LONG todo_failures; + LONG skipped; }; static inline const char *debugstr_pnp( ULONG code ) @@ -339,8 +342,11 @@ static inline void winetest_cleanup_( const char *file ) { data = addr; + InterlockedExchangeAdd( &data->successes, winetest_successes ); InterlockedExchangeAdd( &data->failures, winetest_failures ); + InterlockedExchangeAdd( &data->todo_successes, winetest_todo_successes ); InterlockedExchangeAdd( &data->todo_failures, winetest_todo_failures ); + InterlockedExchangeAdd( &data->skipped, winetest_skipped ); ZwUnmapViewOfSection( NtCurrentProcess(), addr ); } diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 9a27f8e93ac..0a28fda6f99 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -520,8 +520,11 @@ void bus_device_stop(void) SetFilePointer( okfile, 0, NULL, FILE_BEGIN ); SetEndOfFile( okfile ); + InterlockedAdd( &winetest_successes, InterlockedExchange( &test_data->successes, 0 ) ); winetest_add_failures( InterlockedExchange( &test_data->failures, 0 ) ); + InterlockedAdd( &winetest_todo_successes, InterlockedExchange( &test_data->todo_successes, 0 ) ); winetest_add_failures( InterlockedExchange( &test_data->todo_failures, 0 ) ); + InterlockedAdd( &winetest_skipped, InterlockedExchange( &test_data->skipped, 0 ) ); GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); ret = SetupCopyOEMInfW( path, NULL, 0, 0, dest, ARRAY_SIZE(dest), NULL, &filepart ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3759
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.applicationmodel/tests/winrt_test.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/windows.applicationmodel/tests/winrt_test.h b/dlls/windows.applicationmodel/tests/winrt_test.h index 7419782f8df..b7264320cc4 100644 --- a/dlls/windows.applicationmodel/tests/winrt_test.h +++ b/dlls/windows.applicationmodel/tests/winrt_test.h @@ -35,8 +35,11 @@ struct winetest_shared_data BOOL running_under_wine; BOOL winetest_report_success; BOOL winetest_debug; + LONG successes; LONG failures; + LONG todo_successes; LONG todo_failures; + LONG skipped; }; static HANDLE winrt_section; @@ -102,8 +105,11 @@ static void winrt_test_exit_( const char *file, int line ) data = MapViewOfFile( winrt_section, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024 ); ok_(file, line)( !!data, "MapViewOfFile failed, error %lu\n", GetLastError() ); + InterlockedAdd( &winetest_successes, InterlockedExchange( &data->successes, 0 ) ); winetest_add_failures( InterlockedExchange( &data->failures, 0 ) ); + InterlockedAdd( &winetest_todo_successes, InterlockedExchange( &data->todo_successes, 0 ) ); winetest_add_failures( InterlockedExchange( &data->todo_failures, 0 ) ); + InterlockedAdd( &winetest_skipped, InterlockedExchange( &data->skipped, 0 ) ); UnmapViewOfFile( data ); CloseHandle( winrt_section ); } @@ -221,8 +227,11 @@ static inline void winrt_test_exit_( const char *file, int line ) data = MapViewOfFile( winrt_section, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024 ); ok_(file, line)( !!data, "MapViewOfFile failed, error %lu\n", GetLastError() ); + InterlockedExchangeAdd( &data->successes, winetest_successes ); InterlockedExchangeAdd( &data->failures, winetest_failures ); + InterlockedExchangeAdd( &data->todo_successes, winetest_todo_successes ); InterlockedExchangeAdd( &data->todo_failures, winetest_todo_failures ); + InterlockedExchangeAdd( &data->skipped, winetest_skipped ); UnmapViewOfFile( data ); CloseHandle( winrt_section ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3759
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=137130 Your paranoid android. === w7u_2qxl (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w7u_adm (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w7u_el (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w8 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w8adm (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w864 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064v1507 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064v1809 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064_tsign (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w11pro64 (32 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w7pro64 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w864 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064v1507 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064v1809 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064_2qxl (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064_adm (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w1064_tsign (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64_en_AE_u8 (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64_ar (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64_ja (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w10pro64_zh_CN (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w11pro64_amd (64 bit report) === dinput: Fatal: test 'driver_bus' does not exist. === w7u_2qxl (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w7u_adm (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w7u_el (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w8 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w8adm (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w864 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064v1507 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064v1809 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064_tsign (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w11pro64 (32 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w7pro64 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w864 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064v1507 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064v1809 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064_2qxl (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064_adm (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w1064_tsign (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64_en_AE_u8 (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64_ar (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64_ja (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w10pro64_zh_CN (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w11pro64_amd (64 bit report) === dinput: Fatal: test 'driver_hid' does not exist. === w7u_2qxl (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w7u_adm (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w7u_el (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w8 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w8adm (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w864 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064v1507 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064v1809 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064_tsign (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w11pro64 (32 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w7pro64 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w864 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064v1507 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064v1809 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064_2qxl (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064_adm (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w1064_tsign (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64_en_AE_u8 (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64_ar (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64_ja (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w10pro64_zh_CN (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w11pro64_amd (64 bit report) === dinput: Fatal: test 'driver_hid_poll' does not exist. === w8 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w8adm (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w864 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064v1507 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064v1809 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064_tsign (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w11pro64 (32 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w864 (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064v1507 (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064v1809 (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064_2qxl (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064_adm (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w1064_tsign (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64 (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64_en_AE_u8 (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64_ar (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64_ja (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w10pro64_zh_CN (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist. === w11pro64_amd (64 bit report) === windows.applicationmodel: Fatal: test 'application' does not exist.
participants (2)
-
Marvin -
Rémi Bernon