0003-Adapt-unittests-for-RIOT.patch
8.31 KB
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
From 341e82f96ca2cf6d1cedba8d3610c108ba5153dd Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Thu, 12 May 2016 15:08:39 +0200
Subject: [PATCH 3/3] Adapt unittests for RIOT
---
unittests/fix16_exp_unittests.c | 12 ++++++------
unittests/fix16_macros_unittests.c | 6 +++---
unittests/fix16_str_unittests.c | 10 +++++-----
unittests/fix16_unittests.c | 30 +++++++++++++++---------------
unittests/libfixmath-unittests.h | 10 +++++-----
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/unittests/fix16_exp_unittests.c b/unittests/fix16_exp_unittests.c
index afb6706..5b942bb 100644
--- a/unittests/fix16_exp_unittests.c
+++ b/unittests/fix16_exp_unittests.c
@@ -2,11 +2,11 @@
#include <stdio.h>
#include <math.h>
#include <stdbool.h>
-#include "unittests.h"
+#include "libfixmath-unittests.h"
#define delta(a,b) (((a)>=(b)) ? (a)-(b) : (b)-(a))
-int main()
+int fix16_exp_unittests(void)
{
int status = 0;
{
@@ -41,7 +41,7 @@ int main()
count++;
}
- printf("Worst delta %d with input %d\n", max_delta, worst);
+ printf("Worst delta %ld with input %ld\n", (long)max_delta, (long)worst);
printf("Average delta %0.2f\n", (float)sum / count);
TEST(max_delta < 200);
@@ -80,7 +80,7 @@ int main()
count++;
}
- printf("Worst delta %0.4f%% with input %d\n", max_delta, worst);
+ printf("Worst delta %0.4f%% with input %ld\n", max_delta, (long)worst);
printf("Average delta %0.4f%%\n", sum / count);
TEST(max_delta < 1);
@@ -111,14 +111,14 @@ int main()
count++;
}
- printf("Worst delta %d with input %d\n", max_delta, worst);
+ printf("Worst delta %ld with input %ld\n", (long)max_delta, (long)worst);
printf("Average delta %0.2f\n", (float)sum / count);
TEST(max_delta < 20);
}
if (status != 0)
- fprintf(stdout, "\n\nSome tests FAILED!\n");
+ printf( "\n\nSome tests FAILED!\n");
return status;
}
diff --git a/unittests/fix16_macros_unittests.c b/unittests/fix16_macros_unittests.c
index cdfcfaf..6141021 100644
--- a/unittests/fix16_macros_unittests.c
+++ b/unittests/fix16_macros_unittests.c
@@ -4,13 +4,13 @@
#include <stdio.h>
#include <math.h>
#include <stdbool.h>
-#include "unittests.h"
+#include "libfixmath-unittests.h"
#define DO_TEST(i,m) \
TEST(F16(i ## . ## m) == F16C(i,m)) \
TEST(F16(i ## . ## m) == fix16_from_dbl(i ## . ## m))
-int main()
+int fix16_macros_unittests(void)
{
int status = 0;
@@ -103,7 +103,7 @@ int main()
DO_TEST( -0,22957)
if (status != 0)
- fprintf(stdout, "\n\nSome tests FAILED!\n");
+ printf( "\n\nSome tests FAILED!\n");
return status;
}
diff --git a/unittests/fix16_str_unittests.c b/unittests/fix16_str_unittests.c
index 46da171..678bc3c 100644
--- a/unittests/fix16_str_unittests.c
+++ b/unittests/fix16_str_unittests.c
@@ -3,9 +3,9 @@
#include <math.h>
#include <string.h>
#include <stdbool.h>
-#include "unittests.h"
+#include "libfixmath-unittests.h"
-int main()
+int fix16_str_unittests(void)
{
int status = 0;
@@ -93,14 +93,14 @@ int main()
if (strcmp(goodbuf, testbuf) != 0)
{
- printf("Value (fix16_t)%d gave %s, should be %s\n", value, testbuf, goodbuf);
+ printf("Value (fix16_t)%ld gave %s, should be %s\n", (long)value, testbuf, goodbuf);
ok = false;
}
fix16_t roundtrip = fix16_from_str(testbuf);
if (roundtrip != value)
{
- printf("Roundtrip failed: (fix16_t)%d -> %s -> (fix16_t)%d\n", value, testbuf, roundtrip);
+ printf("Roundtrip failed: (fix16_t)%ld -> %s -> (fix16_t)%ld\n", (long)value, testbuf, (long)roundtrip);
ok = false;
}
@@ -111,7 +111,7 @@ int main()
}
if (status != 0)
- fprintf(stdout, "\n\nSome tests FAILED!\n");
+ printf( "\n\nSome tests FAILED!\n");
return status;
}
diff --git a/unittests/fix16_unittests.c b/unittests/fix16_unittests.c
index 9a301a1..b9fbf1a 100644
--- a/unittests/fix16_unittests.c
+++ b/unittests/fix16_unittests.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <math.h>
#include <stdbool.h>
-#include "unittests.h"
+#include "libfixmath-unittests.h"
const fix16_t testcases[] = {
// Small numbers
@@ -47,7 +47,7 @@ const fix16_t max_delta = 1;
const fix16_t max_delta = 0;
#endif
-int main()
+int fix16_unittests(void)
{
int status = 0;
@@ -101,7 +101,7 @@ int main()
#ifndef FIXMATH_NO_OVERFLOW
if (result != fix16_overflow)
{
- printf("\n%d * %d overflow not detected!\n", a, b);
+ printf("\n%ld * %ld overflow not detected!\n", (long)a, (long)b);
failures++;
}
#endif
@@ -109,8 +109,8 @@ int main()
continue;
}
- printf("\n%d * %d = %d\n", a, b, result);
- printf("%f * %f = %d\n", fa, fb, fresult);
+ printf("\n%ld * %ld = %ld\n", (long)a, (long)b, (long)result);
+ printf("%f * %f = %ld\n", fa, fb, (long)fresult);
failures++;
}
}
@@ -176,7 +176,7 @@ int main()
#ifndef FIXMATH_NO_OVERFLOW
if (result != fix16_overflow)
{
- printf("\n%d / %d overflow not detected!\n", a, b);
+ printf("\n%ld / %ld overflow not detected!\n", (long)a, (long)b);
failures++;
}
#endif
@@ -222,7 +222,7 @@ int main()
#ifndef FIXMATH_NO_OVERFLOW
if (result != fix16_overflow)
{
- printf("\n%d + %d overflow not detected!\n", a, b);
+ printf("\n%ld + %ld overflow not detected!\n", (long)a, (long)b);
failures++;
}
#endif
@@ -230,8 +230,8 @@ int main()
continue;
}
- printf("\n%d + %d = %d\n", a, b, result);
- printf("%f + %f = %d\n", fa, fb, fresult);
+ printf("\n%ld + %ld = %ld\n", (long)a, (long)b, (long)result);
+ printf("%f + %f = %ld\n", fa, fb, (long)fresult);
failures++;
}
}
@@ -268,7 +268,7 @@ int main()
#ifndef FIXMATH_NO_OVERFLOW
if (result != fix16_overflow)
{
- printf("\n%d - %d overflow not detected!\n", a, b);
+ printf("\n%ld - %ld overflow not detected!\n", (long)a, (long)b);
failures++;
}
#endif
@@ -276,8 +276,8 @@ int main()
continue;
}
- printf("\n%d - %d = %d\n", a, b, result);
- printf("%f - %f = %d\n", fa, fb, fresult);
+ printf("\n%ld - %ld = %ld\n", (long)a, (long)b, (long)result);
+ printf("%f - %f = %ld\n", fa, fb, (long)fresult);
failures++;
}
}
@@ -321,8 +321,8 @@ int main()
if (delta(fresult, result) > max_delta)
{
- printf("\nfix16_sqrt(%d) = %d\n", a, result);
- printf("sqrt(%f) = %d\n", fa, fresult);
+ printf("\nfix16_sqrt(%ld) = %ld\n", (long)a, (long)result);
+ printf("sqrt(%f) = %ld\n", fa, (long)fresult);
failures++;
}
}
@@ -331,7 +331,7 @@ int main()
}
if (status != 0)
- fprintf(stdout, "\n\nSome tests FAILED!\n");
+ printf( "\n\nSome tests FAILED!\n");
return status;
}
diff --git a/unittests/libfixmath-unittests.h b/unittests/libfixmath-unittests.h
index bac57d2..a72d025 100644
--- a/unittests/libfixmath-unittests.h
+++ b/unittests/libfixmath-unittests.h
@@ -5,14 +5,14 @@
#define STR2(x) STR(x)
#define TEST(x) \
if (!(x)) { \
- fflush(stdout); \
- fflush(stderr); \
- fprintf(stderr, "\033[31;1mFAILED:\033[22;39m " __FILE__ ":" STR2(__LINE__) " " #x "\n"); \
+ printf( "\033[31;1mFAILED:\033[22;39m " __FILE__ ":" STR2(__LINE__) " " #x "\n"); \
status = 1; \
} else { \
- fflush(stdout); \
- fflush(stderr); \
printf("\033[32;1mOK:\033[22;39m " #x "\n"); \
}
+int fix16_exp_unittests(void);
+int fix16_macros_unittests(void);
+int fix16_str_unittests(void);
+int fix16_unittests(void);
--
2.7.4