Update packages

Loki-Astari · May 30, 2024 · 544077b · 544077b
1 parent e8170c5
commit 544077b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
               with:
                 submodules: recursive
                 token: ${{ secrets.GITHUB_TOKEN }}
-            - run: ./configure --enable-dark-mode --with-magicenum-header-only-root=/tmp/magic_enum/include
+            - run: ./configure --enable-dark-mode --with-magicenum-header-only-root=/tmp/magic_enum/include/magic_enum
             - run: |
                 cat Makefile.config
                 cat third/ThorsStorage/Makefile.config
@@ -86,7 +86,7 @@ jobs:
               shell: msys2 {0}
               env:
                      MSYS:  winsymlinks:nativestrict
-              run:  ./configure --disable-colour --disable-vera --with-magicenum-header-only-root=/tmp/magic_enum/include --with-yaml-root=/mingw64/ --disable-test-with-locked-file || cat config.log
+              run:  ./configure --disable-colour --disable-vera --with-magicenum-header-only-root=/tmp/magic_enum/include/magic_enum --with-yaml-root=/mingw64/ --disable-test-with-locked-file
             - name: Make
               shell: msys2 {0}
               run:   make

diff --git a/build b/build
diff --git a/src/Serialize/Makefile b/src/Serialize/Makefile
@@ -10,6 +10,7 @@ LDLIBS_EXTERN_BUILD			+= MagicEnum yaml
 LINK_LIBS					= ThorsLogging
 UNITTEST_LINK_LIBS			= ThorsLogging
 UNITTEST_LDLIBS				= -ldl
+FILE_WARNING_FLAGS			+= -Wno-type-limits
 
 include $(THORSANVIL_ROOT)/build/tools/Makefile
 

diff --git a/src/Serialize/test/ExceptionWhilePrintingTest.cpp b/src/Serialize/test/ExceptionWhilePrintingTest.cpp
@@ -154,7 +154,7 @@ TEST(ExceptionWhilePrintingTest, JsonThrowStream)
 
     std::ios_base::iostate state = stream.rdstate();
     EXPECT_EQ(thrown, true);
-    EXPECT_EQ(state, std::ios::eofbit | std::ios::failbit);
+    EXPECT_NE(0, state & std::ios::failbit);
 }
 
 
@@ -176,7 +176,7 @@ TEST(ExceptionWhilePrintingTest, JsonThrowStreamCatchEnabled)
 
     std::ios_base::iostate state = stream.rdstate();
     EXPECT_EQ(thrown, false);
-    EXPECT_EQ(state, std::ios::eofbit | std::ios::failbit);
+    EXPECT_NE(0, state & std::ios::failbit);
 }
 
 

diff --git a/third/ThorsSocket b/third/ThorsSocket
diff --git a/third/ThorsStorage b/third/ThorsStorage
+1 −1		build
+3 −1		src/ThorsSocket/ConnectionUtil.cpp
+1 −1		src/ThorsSocket/Makefile
+4 −2		src/ThorsSocket/test/MockHeaderInclude.h