Skip to content

Commit

Permalink
Fixes for tests build
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophe-lunarg
christophe-lunarg committed Dec 19, 2023
1 parent 2834400 commit 467e84a
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 30 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
fail-fast: false
matrix:
std: [98, 11, 14, 17, 20]
#std: [98, 11, 14, 17, 20]
std: [98, 17]
config: [Debug, Release]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
Expand All @@ -23,9 +24,18 @@ jobs:
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 -DCMAKE_BUILD_TYPE=${{matrix.config}}
- run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DCMAKE_BUILD_TYPE=${{matrix.config}}
- run: cmake -S. -B ./build_sse2 -DGLM_TEST_FORCE_PURE=ON -DCMAKE_BUILD_TYPE=${{matrix.config}}
- run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DCMAKE_BUILD_TYPE=${{matrix.config}}
- run: cmake --build ./build_pure --parallel --config ${{matrix.config}}
- run: cmake --build ./build_pure_ext --parallel --config ${{matrix.config}}
- run: cmake --build ./build_sse2 --parallel --config ${{matrix.config}}
- run: cmake --build ./build_sse2_ext --parallel --config ${{matrix.config}}
#- run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_pure
#- run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
#- run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_sse2
#- run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext

#name: GLM Unit Tests

Expand Down
2 changes: 1 addition & 1 deletion glm/gtx/string_cast.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
18 changes: 9 additions & 9 deletions test/ext/ext_matrix_common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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;
}

// -------------------- //
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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;
}

// -------------------- //
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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;
Expand Down
32 changes: 16 additions & 16 deletions test/gtx/gtx_hash.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/hash.hpp>
#include <unordered_map>
#include <map>

int test_compile()
{
int Error = 0;

// Vector types
std::unordered_map<glm::vec1, int> map_vec1;
std::map<glm::vec1, int> map_vec1;
Error += ++map_vec1[glm::vec1(0.0f)];
std::unordered_map<glm::vec2, int> map_vec2;
std::map<glm::vec2, int> map_vec2;
Error += ++map_vec2[glm::vec2(0.0f)];
std::unordered_map<glm::vec3, int> map_vec3;
std::map<glm::vec3, int> map_vec3;
Error += ++map_vec3[glm::vec3(0.0f)];
std::unordered_map<glm::vec4, int> map_vec4;
std::map<glm::vec4, int> map_vec4;
Error += ++map_vec4[glm::vec4(0.0f)];

// Quaternion types
std::unordered_map<glm::quat, int> map_quat;
std::map<glm::quat, int> map_quat;
Error += ++map_quat[glm::quat(0.0f, glm::vec3(0.0f))];
std::unordered_map<glm::dualquat, int> map_dualquat;
std::map<glm::dualquat, int> map_dualquat;
Error += ++map_dualquat[glm::dualquat(glm::quat(0.0f, glm::vec3(0.0f)), glm::vec3(0.0f))];

// Matrix types
std::unordered_map<glm::mat2x2, int> map_mat2x2;
std::map<glm::mat2x2, int> map_mat2x2;
Error += ++map_mat2x2[glm::mat2x2(0.0f)];
std::unordered_map<glm::mat2x3, int> map_mat2x3;
std::map<glm::mat2x3, int> map_mat2x3;
Error += ++map_mat2x3[glm::mat2x3(0.0f)];
std::unordered_map<glm::mat2x4, int> map_mat2x4;
std::map<glm::mat2x4, int> map_mat2x4;
Error += ++map_mat2x4[glm::mat2x4(0.0f)];
std::unordered_map<glm::mat3x2, int> map_mat3x2;
std::map<glm::mat3x2, int> map_mat3x2;
Error += ++map_mat3x2[glm::mat3x2(0.0f)];
std::unordered_map<glm::mat3x3, int> map_mat3x3;
std::map<glm::mat3x3, int> map_mat3x3;
Error += ++map_mat3x3[glm::mat3x3(0.0f)];
std::unordered_map<glm::mat3x4, int> map_mat3x4;
std::map<glm::mat3x4, int> map_mat3x4;
Error += ++map_mat3x4[glm::mat3x4(0.0f)];
std::unordered_map<glm::mat4x2, int> map_mat4x2;
std::map<glm::mat4x2, int> map_mat4x2;
Error += ++map_mat4x2[glm::mat4x2(0.0f)];
std::unordered_map<glm::mat4x3, int> map_mat4x3;
std::map<glm::mat4x3, int> map_mat4x3;
Error += ++map_mat4x3[glm::mat4x3(0.0f)];
std::unordered_map<glm::mat4x4, int> map_mat4x4;
std::map<glm::mat4x4, int> map_mat4x4;
Error += ++map_mat4x4[glm::mat4x4(0.0f)];

return Error > 0 ? 0 : 1;
Expand Down

0 comments on commit 467e84a

Please sign in to comment.