Commit 195ff4bc authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale.

parent 6245e2f3
...@@ -2380,7 +2380,7 @@ static void test__get_current_locale(void) ...@@ -2380,7 +2380,7 @@ static void test__get_current_locale(void)
ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk);
ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount);
ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk);
ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), ok(l2->locinfo->lc_time_curr->refcount == 2,
"refcount = %d\n", l2->locinfo->lc_time_curr->refcount); "refcount = %d\n", l2->locinfo->lc_time_curr->refcount);
p__free_locale(l2); p__free_locale(l2);
...@@ -2491,6 +2491,10 @@ START_TEST(msvcr90) ...@@ -2491,6 +2491,10 @@ START_TEST(msvcr90)
if(!init()) if(!init())
return; return;
/* _get_current_locale tests needs to be run first because there's
* a C-locale refcount leak in native _create_locale implementation. */
test__get_current_locale();
test__initterm_e(); test__initterm_e();
test__encode_pointer(); test__encode_pointer();
test_error_messages(); test_error_messages();
...@@ -2526,7 +2530,6 @@ START_TEST(msvcr90) ...@@ -2526,7 +2530,6 @@ START_TEST(msvcr90)
test___strncnt(); test___strncnt();
test_swscanf(); test_swscanf();
test____mb_cur_max_l_func(); test____mb_cur_max_l_func();
test__get_current_locale();
test_ioinfo_flags(); test_ioinfo_flags();
test_strcmp(); test_strcmp();
} }
...@@ -68,7 +68,7 @@ __lc_time_data cloc_time_data = ...@@ -68,7 +68,7 @@ __lc_time_data cloc_time_data =
#if _MSVCR_VER < 110 #if _MSVCR_VER < 110
MAKELCID(LANG_ENGLISH, SORT_DEFAULT), MAKELCID(LANG_ENGLISH, SORT_DEFAULT),
#endif #endif
1, 0, 1, -1,
#if _MSVCR_VER == 0 || _MSVCR_VER >= 100 #if _MSVCR_VER == 0 || _MSVCR_VER >= 100
{{L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat", {{L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat",
L"Sunday", L"Monday", L"Tuesday", L"Wednesday", L"Thursday", L"Friday", L"Saturday", L"Sunday", L"Monday", L"Tuesday", L"Wednesday", L"Thursday", L"Friday", L"Saturday",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment