Fix tests for windows

rHermes · Jun 8, 2024 · 59ede00 · 59ede00
1 parent dc5d1f8
commit 59ede00
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -23,25 +23,25 @@ jobs:
       #
       # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-24.04, windows-latest]
         build_type: [Release, Debug, RelWithDebInfo]
-        cpp_compiler: [g++-13, clang++-15, cl]
+        cpp_compiler: [g++-14, clang++-18, cl]
         include:
           - os: windows-latest
             c_compiler: cl
             cpp_compiler: cl
-          - os: ubuntu-latest
-            c_compiler: gcc-13
-            cpp_compiler: g++-13
-          - os: ubuntu-latest
-            c_compiler: clang-15
-            cpp_compiler: clang++-15
+          - os: ubuntu-24.04
+            c_compiler: gcc-14
+            cpp_compiler: g++-14
+          - os: ubuntu-24.04
+            c_compiler: clang-18
+            cpp_compiler: clang++-18
         exclude:
           - os: windows-latest
-            cpp_compiler: g++-13
+            cpp_compiler: g++-14
           - os: windows-latest
-            cpp_compiler: clang++-15
-          - os: ubuntu-latest
+            cpp_compiler: clang++-18
+          - os: ubuntu-24.04
             cpp_compiler: cl
 
     steps:

diff --git a/tests/fast_pimpl_test.hpp b/tests/fast_pimpl_test.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <hage/core/forward_declared_storage.hpp>
+#include <hage/core/misc.hpp>
 #include <string>
 
 namespace hage::test {
@@ -11,8 +12,18 @@ struct FastPimplTestImpl;
 class FastPimplTest
 {
 private:
+#ifdef _WIN32
+#ifdef HAGE_DEBUG
+  hage::ForwardDeclaredStorage<details::FastPimplTestImpl, 48, 8> m_impl;
+#else
   hage::ForwardDeclaredStorage<details::FastPimplTestImpl, 40, 8> m_impl;
+#endif
 
+#elif defined(__APPLE__)
+  hage::ForwardDeclaredStorage<details::FastPimplTestImpl, 32, 8> m_impl;
+#else
+  hage::ForwardDeclaredStorage<details::FastPimplTestImpl, 40, 8> m_impl;
+#endif
 public:
   FastPimplTest();
   ~FastPimplTest();