Otherwise the messages appear to change every time the line count changes, which making old errors new again.
Signed-off-by: Francois Gouget fgouget@free.fr --- dlls/kernel32/tests/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8dc72bc7f3..bc6f4ab59bf 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -627,13 +627,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG { if (!has_code && is_win64) { - ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ - "%u: loading failed err %u\n", line, GetLastError() ); + ok_(__FILE__,line)( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ + "loading failed err %u\n", GetLastError() ); } else { - ok( !mod, "%u: loading succeeded\n", line ); - ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); + ok_(__FILE__, line)( !mod, "loading succeeded\n" ); + ok_(__FILE__, line)( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError() ); } } else
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=52044
Your paranoid android.
=== w1064v1607 (64 bit report) ===
kernel32: loader.c:664: Test failed: 1382: got test dll but expected fallback loader.c:664: Test failed: 1388: got test dll but expected fallback loader.c:664: Test failed: 1394: got test dll but expected fallback loader.c:664: Test failed: 1401: got test dll but expected fallback loader.c:664: Test failed: 1428: got test dll but expected fallback