Module: wine Branch: master Commit: 5ea2bdda5dd43cc75b71e3512937a63be1b69de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea2bdda5dd43cc75b71e35129...
Author: Francois Gouget fgouget@free.fr Date: Fri May 8 17:46:30 2015 +0200
kernel32/tests: Silence some loader and locale traces that generate too many lines.
---
dlls/kernel32/tests/loader.c | 3 ++- dlls/kernel32/tests/locale.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4922035..0f9ac38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1411,7 +1411,8 @@ static DWORD WINAPI semaphore_thread_proc(void *param)
while (1) { - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + if (winetest_debug > 1) + trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; }
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 95e0ac6..e2ec152 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3137,8 +3137,9 @@ static void test_ConvertDefaultLocale(void) static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, DWORD dwFlags, LONG_PTR lParam) { - trace("%08x, %s, %s, %08x, %08lx\n", - lgrpid, lpszNum, lpszName, dwFlags, lParam); + if (winetest_debug > 1) + trace("%08x, %s, %s, %08x, %08lx\n", + lgrpid, lpszNum, lpszName, dwFlags, lParam);
ok(pIsValidLanguageGroup(lgrpid, dwFlags) == TRUE, "Enumerated grp %d not valid (flags %d)\n", lgrpid, dwFlags); @@ -3187,7 +3188,8 @@ static void test_EnumSystemLanguageGroupsA(void)
static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) { - trace( "%s %x\n", wine_dbgstr_w(name), flags ); + if (winetest_debug > 1) + trace( "%s %x\n", wine_dbgstr_w(name), flags ); return TRUE; }
@@ -3212,7 +3214,8 @@ static void test_EnumSystemLocalesEx(void) static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) { - trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); + if (winetest_debug > 1) + trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam);
/* invalid locale enumerated on some platforms */ if (lcid == 0) @@ -3293,7 +3296,8 @@ static void test_SetLocaleInfoA(void)
static BOOL CALLBACK luilocale_proc1A(LPSTR value, LONG_PTR lParam) { - trace("%s %08lx\n", value, lParam); + if (winetest_debug > 1) + trace("%s %08lx\n", value, lParam); return(TRUE); }