From 293dfc782552f35078215cd39a103c9646051fb2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 21 Sep 2019 22:11:52 +0200
Subject: test: fix cmocka assert_float_equal shadowing warnings

Just use cmocka's function. It takes an epsilon argument, which we now
provide directly.

There's no assert_double_equal() in cmocka (and the float variant
actually forces a conversion to the float type), but fortunately we
didn't use it.
---
 test/gl_video.c     | 10 +++++-----
 test/test_helpers.h |  3 ---
 wscript             |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/gl_video.c b/test/gl_video.c
index 6b5f3a7060..91271bd2d6 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_float_equal(x, 2.40f);
+    assert_float_equal(x, 2.40f, FLT_EPSILON);
 
     x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0);
-    assert_float_equal(x, 1.961f);
+    assert_float_equal(x, 1.961f, FLT_EPSILON);
 }
 
 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_float_equal(x, 2.40f);
+    assert_float_equal(x, 2.40f, FLT_EPSILON);
 }
 
 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_float_equal(x, 2.40f);
+    assert_float_equal(x, 2.40f, FLT_EPSILON);
 }
 
 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_float_equal(x, mid_gamma);
+    assert_float_equal(x, mid_gamma, FLT_EPSILON);
 }
 
 int main(void) {
diff --git a/test/test_helpers.h b/test/test_helpers.h
index 49328f623f..8a8669c624 100644
--- a/test/test_helpers.h
+++ b/test/test_helpers.h
@@ -10,7 +10,4 @@
 #include <math.h>
 #include <float.h>
 
-#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
diff --git a/wscript b/wscript
index 1f70bb7106..dfe551607b 100644
--- a/wscript
+++ b/wscript
@@ -118,7 +118,7 @@ build_options = [
     }, {
         'name': '--test',
         'desc': 'test suite (using cmocka)',
-        'func': check_pkg_config('cmocka', '>= 1.0.0'),
+        'func': check_pkg_config('cmocka', '>= 1.1.5'),
         'default': 'disable',
     }, {
         'name': '--clang-database',
-- 
cgit v1.2.3