From 0ed88cfda8c03af106faab8d2bdb2369f82051ad Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sat, 14 Sep 2019 12:46:04 +0300 Subject: [PATCH] test: fix running test on windows (msvc) --- test/include/common.h | 2 ++ test/runner.c | 3 ++- test/src/test_vec4.c | 17 ++++++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/test/include/common.h b/test/include/common.h index 45bd156..7459d57 100644 --- a/test/include/common.h +++ b/test/include/common.h @@ -97,9 +97,11 @@ typedef struct test_entry_t { # define drand48() ((float)(rand() / (RAND_MAX + 1.0))) # define OK_TEXT "ok:" # define FAIL_TEXT "fail:" +# define FINAL_TEXT "^_^" #else # define OK_TEXT "✔︎" # define FAIL_TEXT "𐄂" +# define FINAL_TEXT "🎉" #endif #endif /* common_h */ diff --git a/test/runner.c b/test/runner.c index 2af6b67..7d4d858 100644 --- a/test/runner.c +++ b/test/runner.c @@ -74,7 +74,8 @@ main(int argc, const char * argv[]) { } if (failed == 0) { - fprintf(stderr, BOLDGREEN "\n All tests are passed 🎉\n" RESET); + fprintf(stderr, + BOLDGREEN "\n All tests are passed " FINAL_TEXT "\n" RESET); } fprintf(stderr, diff --git a/test/src/test_vec4.c b/test/src/test_vec4.c index 3995b9f..160f1e7 100644 --- a/test/src/test_vec4.c +++ b/test/src/test_vec4.c @@ -63,11 +63,14 @@ test_vec4_clamp(vec4 v, float minVal, float maxVal) { } TEST_IMPL(vec4) { - vec4 v, v1, v2, v3, v4; + vec4 v, v1, v2, v3, v4, one, zero; vec4s vs1, vs2, vs3, vs4; int i; float d1, d2; + glm_vec4_one(one); + glm_vec4_zero(zero); + for (i = 0; i < 1000; i++) { /* 1. test SSE/SIMD dot product */ test_rand_vec4(v); @@ -106,20 +109,20 @@ TEST_IMPL(vec4) { /* test zero */ glm_vec4_zero(v); - ASSERTIFY(test_assert_vec4_eq(GLM_VEC4_ZERO, v)) + ASSERTIFY(test_assert_vec4_eq(zero, v)) /* test one */ glm_vec4_one(v); - ASSERTIFY(test_assert_vec4_eq(GLM_VEC4_ONE, v)) + ASSERTIFY(test_assert_vec4_eq(one, v)) /* adds, subs, div, divs, mul */ - glm_vec4_add(v, GLM_VEC4_ONE, v); + glm_vec4_add(v, one, v); ASSERT(glmc_vec4_eq_eps(v, 2)) glm_vec4_adds(v, 10, v); ASSERT(glmc_vec4_eq_eps(v, 12)) - glm_vec4_sub(v, GLM_VEC4_ONE, v); + glm_vec4_sub(v, one, v); ASSERT(glmc_vec4_eq_eps(v, 11)) glm_vec4_subs(v, 1, v); @@ -146,10 +149,10 @@ TEST_IMPL(vec4) { /* addadd, subadd, muladd */ glm_vec4_one(v); - glm_vec4_addadd(GLM_VEC4_ONE, GLM_VEC4_ONE, v); + glm_vec4_addadd(one, one, v); ASSERT(glmc_vec4_eq_eps(v, 3)) - glm_vec4_subadd(GLM_VEC4_ONE, GLM_VEC4_ZERO, v); + glm_vec4_subadd(one, zero, v); ASSERT(glmc_vec4_eq_eps(v, 4)) glm_vec4_broadcast(2, v1);