From d479d5bf359df47ef7134a34a881ae875191ebed Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 31 Aug 2018 00:20:05 +0200 Subject: [PATCH] Tentative fix Travis --- test/core/core_type_mat3x3.cpp | 25 ++++++------------------- test/core/core_type_vec3.cpp | 1 - 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index 9c2a0e68..99e1f41e 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -13,31 +13,18 @@ #include #include #include -#include #include -void print(glm::dmat3 const& Mat0) -{ - printf("mat3(\n"); - printf("\tvec3(%2.3f, %2.3f, %2.3f)\n", Mat0[0][0], Mat0[0][1], Mat0[0][2]); - printf("\tvec3(%2.3f, %2.3f, %2.3f)\n", Mat0[1][0], Mat0[1][1], Mat0[1][2]); - printf("\tvec3(%2.3f, %2.3f, %2.3f))\n\n", Mat0[2][0], Mat0[2][1], Mat0[2][2]); -} - -int test_mat3x3() +static int test_mat3x3() { glm::dmat3 Mat0( - glm::dvec3(0.6f, 0.2f, 0.3f), - glm::dvec3(0.2f, 0.7f, 0.5f), + glm::dvec3(0.6f, 0.2f, 0.3f), + glm::dvec3(0.2f, 0.7f, 0.5f), glm::dvec3(0.3f, 0.5f, 0.7f)); glm::dmat3 Inv0 = glm::inverse(Mat0); glm::dmat3 Res0 = Mat0 * Inv0; - print(Mat0); - print(Inv0); - print(Res0); - - return 0; + return glm::all(glm::equal(Res0, glm::dmat3(1.0), 0.01)) ? 0 : 1; } static int test_operators() @@ -59,7 +46,7 @@ static int test_operators() return (S && !R) ? 0 : 1; } -int test_inverse() +static int test_inverse() { int Error(0); @@ -91,7 +78,7 @@ int test_inverse() return Error; } -int test_ctr() +static int test_ctr() { int Error(0); diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 78fc5728..4da8187d 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include static glm::vec3 g1;