Fix test failure on MSVC with C++ exceptions globally disabled.

ned14 · Feb 4, 2025 · 6e6029e · 6e6029e
1 parent ebfedb6
commit 6e6029e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
@@ -1,4 +1,4 @@
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define LLFIO_PREVIOUS_COMMIT_REF    fb98235705ad2fd74ed83fb2c6a51a909b2e8d0a
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2025-02-02 22:29:45 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE fb982357
+#define LLFIO_PREVIOUS_COMMIT_REF    ebfedb603adb1227523390815a18a4189466078b
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2025-02-03 23:43:43 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE ebfedb60
diff --git a/test/tests/mapped.cpp b/test/tests/mapped.cpp
@@ -28,7 +28,9 @@ static inline void TestMappedView1()
 {
   using namespace LLFIO_V2_NAMESPACE;
   using LLFIO_V2_NAMESPACE::file_handle;
-  file_handle fh = file_handle::file({}, "testfile", file_handle::mode::write, file_handle::creation::if_needed, file_handle::caching::all, file_handle::flag::unlink_on_first_close).value();
+  file_handle fh = file_handle::file({}, "testfile", file_handle::mode::write, file_handle::creation::if_needed, file_handle::caching::all,
+                                     file_handle::flag::unlink_on_first_close)
+                   .value();
   fh.truncate(10000 * sizeof(int)).value();
   section_handle sh(section_handle::section(fh).value());
   mapped<int> v1(sh, 5);
@@ -43,6 +45,7 @@ static inline void TestMappedView1()
   v3[49] = 5;
   BOOST_CHECK(v3[0] == 78);
   BOOST_CHECK(v3[49] == 5);
+#if !defined(_WIN32) || defined(__cpp_exceptions)
   LLFIO_EXCEPTION_TRY
   {
     // Overly large views must not extend the file until written to
@@ -58,21 +61,24 @@ static inline void TestMappedView1()
     BOOST_CHECK(false);
 #endif
   }
+#endif
 }
 
 static inline void TestMappedView2()
 {
   using namespace LLFIO_V2_NAMESPACE;
-  using LLFIO_V2_NAMESPACE::file_handle;
   using LLFIO_V2_NAMESPACE::byte;
+  using LLFIO_V2_NAMESPACE::file_handle;
 #ifndef _WIN32
   std::cout << "NOTE: utils::running_under_wsl() = " << utils::running_under_wsl() << std::endl;
 #endif
   {
     std::error_code ec;
     filesystem::remove("testfile", ec);
   }
-  mapped_file_handle mfh = mapped_file_handle::mapped_file(1024 * 1024, {}, "testfile", file_handle::mode::write, file_handle::creation::if_needed, file_handle::caching::all, file_handle::flag::unlink_on_first_close).value();
+  mapped_file_handle mfh = mapped_file_handle::mapped_file(1024 * 1024, {}, "testfile", file_handle::mode::write, file_handle::creation::if_needed,
+                                                           file_handle::caching::all, file_handle::flag::unlink_on_first_close)
+                           .value();
   mfh.truncate(10000 * sizeof(int)).value();
   byte *addr = mfh.address();
   BOOST_CHECK(addr != nullptr);
@@ -115,7 +121,9 @@ static inline void TestMappedView2()
   BOOST_CHECK(v1[0] == 78);
 
   // Use a different handle to extend the file
-  mapped_file_handle mfh2 = mapped_file_handle::mapped_file(1024 * 1024, {}, "testfile", file_handle::mode::write, file_handle::creation::open_existing, file_handle::caching::all, file_handle::flag::unlink_on_first_close).value();
+  mapped_file_handle mfh2 = mapped_file_handle::mapped_file(1024 * 1024, {}, "testfile", file_handle::mode::write, file_handle::creation::open_existing,
+                                                            file_handle::caching::all, file_handle::flag::unlink_on_first_close)
+                            .value();
   mfh2.truncate(10000 * sizeof(int)).value();
   v1 = attached<int>(mfh2);
   BOOST_CHECK(v1.size() == 10000);
@@ -132,7 +140,9 @@ static inline void TestMappedView2()
   mfh.truncate(1 * sizeof(int)).value();
 
   // Use a normal file handle to extend the file
-  file_handle fh = file_handle::file({}, "testfile", file_handle::mode::write, file_handle::creation::open_existing, file_handle::caching::all, file_handle::flag::unlink_on_first_close).value();
+  file_handle fh = file_handle::file({}, "testfile", file_handle::mode::write, file_handle::creation::open_existing, file_handle::caching::all,
+                                     file_handle::flag::unlink_on_first_close)
+                   .value();
   fh.truncate(10000 * sizeof(int)).value();
   // On POSIX this will have updated the mapping, on Windows it will not, so prod Windows
   mfh.update_map().value();