Fixes for Windows

franzpoeschel · Oct 29, 2024 · 1242194 · 1242194
1 parent 0c4b21d
commit 1242194
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/include/openPMD/binding/python/Pickle.hpp b/include/openPMD/binding/python/Pickle.hpp
@@ -22,6 +22,7 @@
 
 #include "openPMD/IO/Access.hpp"
 #include "openPMD/Series.hpp"
+#include "openPMD/auxiliary/StringManip.hpp"
 #include "openPMD/backend/Attributable.hpp"
 
 #include "Common.hpp"
@@ -75,7 +76,9 @@ add_pickle(pybind11::class_<T_Args...> &cl, T_SeriesAccessor &&seriesAccessor)
                 try
                 {
                     return !series.has_value() || !series->operator bool() ||
-                        series->myPath().filePath() != filename;
+                        auxiliary::replace_all(
+                            series->myPath().filePath(), "\\", "/") !=
+                        auxiliary::replace_all(filename, "\\", "/");
                 }
                 /*
                  * Better safe than sorry, if anything goes wrong because the

diff --git a/test/SerialIOTest.cpp b/test/SerialIOTest.cpp
@@ -177,7 +177,9 @@ void write_and_read_many_iterations(
 
     {
         Series write(filename, Access::CREATE);
-        REQUIRE(write.myPath().filePath() == filename);
+        REQUIRE(
+            auxiliary::replace_all(write.myPath().filePath(), "\\", "/") ==
+            auxiliary::replace_all(filename, "\\", "/"));
         for (unsigned int i = 0; i < nIterations; ++i)
         {
             // std::cout << "Putting iteration " << i << std::endl;
@@ -1852,8 +1854,11 @@ inline void fileBased_write_test(const std::string &backend)
             Access::CREATE,
             jsonCfg);
         REQUIRE(
-            o.myPath().filePath() ==
-            ("../samples/subdir/serial_fileBased_write%03T." + backend));
+            auxiliary::replace_all(o.myPath().filePath(), "\\", "/") ==
+            auxiliary::replace_all(
+                "../samples/subdir/serial_fileBased_write%03T." + backend,
+                "\\",
+                "/"));
 
         ParticleSpecies &e_1 = o.iterations[1].particles["e"];