Upgrade module-test to msvc 16.11.5 and 17.0-pre5 (#2558)

fmtlib · Oct 24, 2021 · df40e94 · df40e94
1 parent e6d5059
commit df40e94
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/test/module-test.cc b/test/module-test.cc
@@ -76,8 +76,10 @@ bool oops_detail_namespace_is_visible;
 namespace fmt {
 bool namespace_detail_invisible() {
 #if defined(FMT_HIDE_MODULE_BUGS) && defined(_MSC_FULL_VER) && \
-    _MSC_FULL_VER <= 192930129
-  // bug in msvc up to 16.11-pre1:
+    ((_MSC_VER == 1929 && _MSC_FULL_VER <= 192930136) ||       \
+     (_MSC_VER == 1930 && _MSC_FULL_VER <= 193030704))
+  // bug in msvc up to 16.11.5 / 17.0-pre5:
+
   // the namespace is visible even when it is neither
   // implicitly nor explicitly exported
   return true;
@@ -97,8 +99,8 @@ TEST(module_test, detail_namespace) {
 // macros must not be imported from a *named* module  [cpp.import]/5.1
 TEST(module_test, macros) {
 #if defined(FMT_HIDE_MODULE_BUGS) && defined(_MSC_FULL_VER) && \
-    _MSC_FULL_VER <= 192930129
-  // bug in msvc up to 16.11-pre1:
+    _MSC_FULL_VER <= 192930130
+  // bug in msvc up to 16.11-pre2:
   // include-guard macros leak from BMI
   // and even worse: they cannot be #undef-ined
   macro_leaked = false;
@@ -456,8 +458,7 @@ TEST(module_test, time_duration) {
 }
 
 TEST(module_test, weekday) {
-  EXPECT_EQ("Monday",
-            std::format(std::locale::classic(), "{:%A}", fmt::weekday(1)));
+  EXPECT_EQ("Mon", fmt::format(std::locale::classic(), "{}", fmt::weekday(1)));
 }
 
 TEST(module_test, to_string_view) {