1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
commit f4f24c105f9c132e84cba9a9707acc261033a816
Author: Ilya Tumaykin <itumaykin@gmail.com>
Date: Thu Feb 1 14:05:06 2018 +0300
tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON
Fixes #5253.
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 <math.h>
#include <float.h>
-#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
|
