浏览代码

C.I. Fix timeout

Christophe 2 年之前
父节点
当前提交
971f22222e

+ 18 - 0
.github/workflows/ci.yml

@@ -24,6 +24,8 @@ jobs:
       - run: echo "🍏 This job's status is ${{ job.status }}."
       - name: CMake Version
         run: cmake --version
+      - run: cmake -S. -B ./build_auto
+      - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON
       - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
@@ -32,6 +34,8 @@ jobs:
       - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_auto --config ${{matrix.config}}
+      - run: cmake --build ./build_unknown --config ${{matrix.config}}
       - run: cmake --build ./build_pure_std --config ${{matrix.config}}
       - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
       - run: cmake --build ./build_sse2_std --config ${{matrix.config}}
@@ -40,6 +44,8 @@ jobs:
       - run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_std --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std
@@ -72,6 +78,8 @@ jobs:
         run: gcc --version
       - name: CMake Version
         run: cmake --version
+      - run: cmake -S. -B ./build_auto
+      - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON
       - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
@@ -80,6 +88,8 @@ jobs:
       - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_auto --config ${{matrix.config}}
+      - run: cmake --build ./build_unknown --config ${{matrix.config}}
       - run: cmake --build ./build_pure_std --config ${{matrix.config}}
       - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
       - run: cmake --build ./build_sse2_std --config ${{matrix.config}}
@@ -88,6 +98,8 @@ jobs:
       - run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_std --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std
@@ -120,6 +132,8 @@ jobs:
         run: cmake --version
       - name: Clang Version
         run: clang --version
+      - run: cmake -S. -B ./build_auto
+      - run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON
       - run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
@@ -128,6 +142,8 @@ jobs:
       - run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
       - run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
       - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+      - run: cmake --build ./build_auto --config ${{matrix.config}}
+      - run: cmake --build ./build_unknown --config ${{matrix.config}}
       - run: cmake --build ./build_pure_std --config ${{matrix.config}}
       - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
       - run: cmake --build ./build_sse2_std --config ${{matrix.config}}
@@ -136,6 +152,8 @@ jobs:
       - run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_std --config ${{matrix.config}}
       - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
+      - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
       - run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std

+ 1 - 1
test/CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 
 option(GLM_TEST_ENABLE_LANG_EXTENSIONS "Enable language extensions" OFF)
 
-option(GLM_DISABLE_AUTO_DETECTION "Enable language extensions" OFF)
+option(GLM_DISABLE_AUTO_DETECTION "Disable platform, compiler, arch and C++ language detection" OFF)
 
 if(GLM_DISABLE_AUTO_DETECTION)
 	add_definitions(-DGLM_FORCE_PLATFORM_UNKNOWN -DGLM_FORCE_COMPILER_UNKNOWN -DGLM_FORCE_ARCH_UNKNOWN -DGLM_FORCE_CXX_UNKNOWN)

+ 1 - 1
test/perf/perf_matrix_div.cpp

@@ -118,7 +118,7 @@ static int comp_mat4_div_mat4(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 
 	int Error = 0;
 

+ 1 - 1
test/perf/perf_matrix_inverse.cpp

@@ -115,7 +115,7 @@ static int comp_mat4_inverse(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 
 	int Error = 0;
 

+ 1 - 1
test/perf/perf_matrix_mul.cpp

@@ -119,7 +119,7 @@ static int comp_mat4_mul_mat4(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 
 	int Error = 0;
 

+ 1 - 1
test/perf/perf_matrix_mul_vector.cpp

@@ -119,7 +119,7 @@ static int comp_mat4_mul_vec4(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 	
 	int Error = 0;
 

+ 1 - 1
test/perf/perf_matrix_transpose.cpp

@@ -115,7 +115,7 @@ static int comp_mat4_transpose(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 
 	int Error = 0;
 

+ 1 - 1
test/perf/perf_vector_mul_matrix.cpp

@@ -119,7 +119,7 @@ static int comp_vec4_mul_mat4(std::size_t Samples)
 
 int main()
 {
-	std::size_t const Samples = 100000;
+	std::size_t const Samples = 1000;
 	
 	int Error = 0;