A few fixes to tests for Windows port.

llvm-svn: 186334

2 files changed, 2 insertions, 2 deletions

diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
index 6c49b50abc7..ee6aafe68f2 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
@@ -30,7 +30,7 @@ int main()
     test<char, std::numeric_limits<char>::is_signed ? 7 : 8>();
     test<signed char, 7>();
     test<unsigned char, 8>();
-    test<wchar_t, std::numeric_limits<wchar_t>::is_signed ? 31 : 32>();
+    test<wchar_t, std::numeric_limits<wchar_t>::is_signed ? sizeof(wchar_t)*8-1 : sizeof(wchar_t)*8>();
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 16>();
     test<char32_t, 32>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
index 8df5664fbdb..73e87fc9d04 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
@@ -34,7 +34,7 @@ int main()
     test<char, 2>();
     test<signed char, 2>();
     test<unsigned char, 2>();
-    test<wchar_t, 9>();
+    test<wchar_t, 5*sizeof(wchar_t)/2-1>();  // 4 -> 9 and 2 -> 4
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 4>();
     test<char32_t, 9>();