Fixes for tests build

g-truc · Dec 19, 2023 · e06df2e · e06df2e
1 parent 2834400
commit e06df2e
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,14 +2,102 @@ name: ci
 run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
 on: [push]
 jobs:
-  Pure:
-    runs-on: ${{ matrix.os}}
+  windows-latest:
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        std: [98, 11, 14, 17, 20]
+        std: [98, 11, 17]
         config: [Debug, Release]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        #os: [ubuntu-latest, macos-latest, windows-latest]
+        vs-version: [13, 14, 15, 16, 17]
+        exclude:
+          - std: 17
+            vs-version: 13
+          - std: 17
+            vs-version: 14
+          - std: 17
+            vs-version: 15
+
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ github.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+      - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+      - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_avx -DGLM_TEST_ENABLE_SIMD_AVX=ON
+      - run: cmake -S. -B ./build_avx_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_pure --config ${{matrix.config}}
+      - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2
+      #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_ext
+  ubuntu-latest:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        std: [98, 11, 17]
+        config: [Debug, Release]
+        gcc: [4.7, 8, 12]
+        exclude:
+          - std: 17
+            gcc: 4.7
+          - std: 17
+            gcc: 8
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ github.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+      - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+      - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_avx2 -DGLM_TEST_ENABLE_SIMD_AVX=ON
+      - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_pure --config ${{matrix.config}}
+      - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+  macos-latest:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        std: [98, 11, 17]
+        config: [Debug, Release]
+        version: [3.9, 15]
+        exclude:
+          - std: 17
+            version: 3.9
+        #os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
       - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
@@ -22,10 +110,18 @@ jobs:
         run: |
           ls ${{ github.workspace }}
       - run: echo "🍏 This job's status is ${{ job.status }}."
-      #- run: cmake -S. -B ./build_98_pure -D GLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON -DCMAKE_BUILD_TYPE=${{matrix.config}}
-      - run: cmake -S. -B ./build_auto -DCMAKE_BUILD_TYPE=${{matrix.config}}
-      - run: cmake --build ./build_auto --parallel --config ${{matrix.config}}
-      - run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_auto
+      - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+      - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+      - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake -S. -B ./build_avx2 -DGLM_TEST_ENABLE_SIMD_AVX=ON
+      - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_pure --config ${{matrix.config}}
+      - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+      - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+      - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
 
 #name: GLM Unit Tests
 

diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
@@ -20,8 +20,6 @@
 #	endif
 #endif
 
-#include <functional>
-
 #include "../vec2.hpp"
 #include "../vec3.hpp"
 #include "../vec4.hpp"
@@ -43,9 +41,12 @@
 #include "../mat4x4.hpp"
 
 #if !GLM_HAS_CXX11_STL
-#	error "GLM_GTX_hash requires C++11 standard library support"
+#pragma message("GLM_GTX_hash requires C++11 standard library support")
 #endif
 
+#if GLM_LANG & GLM_LANG_CXX11
+#include <functional>
+
 namespace std
 {
 	template<typename T, glm::qualifier Q>
@@ -140,3 +141,5 @@ namespace std
 } // namespace std
 
 #include "hash.inl"
+
+#endif //GLM_LANG & GLM_LANG_CXX11
diff --git a/glm/gtx/string_cast.inl b/glm/gtx/string_cast.inl
@@ -31,7 +31,7 @@ namespace detail
 #		if (GLM_COMPILER & GLM_COMPILER_VC)
 			vsprintf_s(text, STRING_BUFFER, msg, list);
 #		else//
-			std::vsprintf(text, msg, list);
+			std::vsnprintf(text, STRING_BUFFER, msg, list);
 #		endif//
 		va_end(list);
 

diff --git a/test/ext/ext_matrix_common.cpp b/test/ext/ext_matrix_common.cpp
@@ -70,7 +70,7 @@ static int test_abs()
 		glm::bvec4 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec4 const col3 = glm::equal(D[2], A[2]);
 		glm::bvec4 const col4 = glm::equal(D[3], A[3]);
-		Error += glm::all(glm::bvec4{glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4)}) ? 0 : 1;
+		Error += glm::all(glm::bvec4(glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4))) ? 0 : 1;
 	}
 	{
 		glm::mat4x3 A(
@@ -91,7 +91,7 @@ static int test_abs()
 		glm::bvec3 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec3 const col3 = glm::equal(D[2], A[2]);
 		glm::bvec3 const col4 = glm::equal(D[3], A[3]);
-		Error += glm::all(glm::bvec4{glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4)}) ? 0 : 1;
+		Error += glm::all(glm::bvec4(glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4))) ? 0 : 1;
 	}
 	{
 		glm::mat4x2 A(
@@ -112,7 +112,7 @@ static int test_abs()
 		glm::bvec2 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec2 const col3 = glm::equal(D[2], A[2]);
 		glm::bvec2 const col4 = glm::equal(D[3], A[3]);
-		Error += glm::all(glm::bvec4{glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4)}) ? 0 : 1;
+		Error += glm::all(glm::bvec4(glm::all(col1), glm::all(col2), glm::all(col3), glm::all(col4))) ? 0 : 1;
 	}
 
 	// -------------------- //
@@ -134,7 +134,7 @@ static int test_abs()
 		glm::bvec4 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec4 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec4 const col3 = glm::equal(D[2], A[2]);
-		Error += glm::all(glm::bvec3{glm::all(col1), glm::all(col2), glm::all(col3)}) ? 0 : 1;
+		Error += glm::all(glm::bvec3(glm::all(col1), glm::all(col2), glm::all(col3))) ? 0 : 1;
 	}
 	{
 		glm::mat3 A(
@@ -152,7 +152,7 @@ static int test_abs()
 		glm::bvec3 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec3 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec3 const col3 = glm::equal(D[2], A[2]);
-		Error += glm::all(glm::bvec3{glm::all(col1), glm::all(col2), glm::all(col3)}) ? 0 : 1;
+		Error += glm::all(glm::bvec3(glm::all(col1), glm::all(col2), glm::all(col3))) ? 0 : 1;
 	}
 	{
 		glm::mat3x2 A(
@@ -170,7 +170,7 @@ static int test_abs()
 		glm::bvec2 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec2 const col2 = glm::equal(D[1], A[1]);
 		glm::bvec2 const col3 = glm::equal(D[2], A[2]);
-		Error += glm::all(glm::bvec3{glm::all(col1), glm::all(col2), glm::all(col3)}) ? 0 : 1;
+		Error += glm::all(glm::bvec3(glm::all(col1), glm::all(col2), glm::all(col3))) ? 0 : 1;
 	}
 
 	// -------------------- //
@@ -189,7 +189,7 @@ static int test_abs()
 		glm::mat2x4 D = glm::abs(C);
 		glm::bvec4 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec4 const col2 = glm::equal(D[1], A[1]);
-		Error += glm::all(glm::bvec2{glm::all(col1), glm::all(col2)}) ? 0 : 1;
+		Error += glm::all(glm::bvec2(glm::all(col1), glm::all(col2))) ? 0 : 1;
 	}
 	{
 		glm::mat2x3 A(
@@ -204,7 +204,7 @@ static int test_abs()
 		glm::mat2x3 D = glm::abs(C);
 		glm::bvec3 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec3 const col2 = glm::equal(D[1], A[1]);
-		Error += glm::all(glm::bvec2{glm::all(col1), glm::all(col2)}) ? 0 : 1;
+		Error += glm::all(glm::bvec2(glm::all(col1), glm::all(col2))) ? 0 : 1;
 	}
 	{
 		glm::mat2 A(
@@ -219,7 +219,7 @@ static int test_abs()
 		glm::mat2 D = glm::abs(C);
 		glm::bvec2 const col1 = glm::equal(D[0], A[0]);
 		glm::bvec2 const col2 = glm::equal(D[1], A[1]);
-		Error += glm::all(glm::bvec2{glm::all(col1), glm::all(col2)}) ? 0 : 1;
+		Error += glm::all(glm::bvec2(glm::all(col1), glm::all(col2))) ? 0 : 1;
 	}
 
 	return Error;

diff --git a/test/gtx/gtx_hash.cpp b/test/gtx/gtx_hash.cpp
@@ -1,5 +1,7 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/hash.hpp>
+
+#if GLM_LANG & GLM_LANG_CXX11
 #include <unordered_map>
 
 int test_compile()
@@ -47,10 +49,10 @@ int test_compile()
 
 int main()
 {
-	int Error = 0;
+    int Error = 0;
 
-	Error += test_compile();
+    Error += test_compile();
 
-	return Error;
+    return Error;
 }
-
+#endif//GLM_LANG& GLM_LANG_CXX11