From f4f24c105f9c132e84cba9a9707acc261033a816 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Thu, 1 Feb 2018 14:05:06 +0300 Subject: tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON Fixes #5253. --- test/gl_video.c | 10 +++++----- test/test_helpers.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/gl_video.c b/test/gl_video.c index a2d2577e25..6b5f3a7060 100644 --- a/test/gl_video.c +++ b/test/gl_video.c @@ -4,22 +4,22 @@ static void test_scale_ambient_lux_limits(void **state) { float x; x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 16.0); - assert_double_equal(x, 2.40f); + assert_float_equal(x, 2.40f); x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0); - assert_double_equal(x, 1.961f); + assert_float_equal(x, 1.961f); } static void test_scale_ambient_lux_sign(void **state) { float x; x = gl_video_scale_ambient_lux(16.0, 64.0, 1.961, 2.40, 64.0); - assert_double_equal(x, 2.40f); + assert_float_equal(x, 2.40f); } static void test_scale_ambient_lux_clamping(void **state) { float x; x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 0.0); - assert_double_equal(x, 2.40f); + assert_float_equal(x, 2.40f); } static void test_scale_ambient_lux_log10_midpoint(void **state) { @@ -27,7 +27,7 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { // 32 corresponds to the the midpoint after converting lux to the log10 scale x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 32.0); float mid_gamma = (2.40 - 1.961) / 2 + 1.961; - assert_double_equal(x, mid_gamma); + assert_float_equal(x, mid_gamma); } int main(void) { diff --git a/test/test_helpers.h b/test/test_helpers.h index 7a61da82ea..49328f623f 100644 --- a/test/test_helpers.h +++ b/test/test_helpers.h @@ -10,6 +10,7 @@ #include #include -#define assert_double_equal(a, b) assert_true(fabs(a - b) <= DBL_EPSILON) +#define assert_double_equal(a, b) assert_true(fabs((a) - (b)) <= DBL_EPSILON * fmax(fabs(a), fabs(b))) +#define assert_float_equal(a, b) assert_true(fabsf((a) - (b)) <= FLT_EPSILON * fmaxf(fabsf(a), fabsf(b))) #endif -- cgit v1.2.3