diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/CMakeLists.txt | 22 | ||||
-rw-r--r-- | regress/assert.c | 4 | ||||
-rw-r--r-- | regress/cred.c | 3 | ||||
-rw-r--r-- | regress/dev.c | 3 |
4 files changed, 20 insertions, 12 deletions
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt index b8fea64..0314c38 100644 --- a/regress/CMakeLists.txt +++ b/regress/CMakeLists.txt | |||
@@ -2,17 +2,15 @@ | |||
2 | # Use of this source code is governed by a BSD-style | 2 | # Use of this source code is governed by a BSD-style |
3 | # license that can be found in the LICENSE file. | 3 | # license that can be found in the LICENSE file. |
4 | 4 | ||
5 | # cred | 5 | add_custom_target(regress ALL) |
6 | add_executable(regress_cred cred.c) | ||
7 | target_link_libraries(regress_cred fido2_shared) | ||
8 | add_custom_command(TARGET regress_cred POST_BUILD COMMAND regress_cred) | ||
9 | 6 | ||
10 | # assert | 7 | macro(add_regress_test NAME SOURCES) |
11 | add_executable(regress_assert assert.c) | 8 | add_executable(${NAME} ${SOURCES}) |
12 | target_link_libraries(regress_assert fido2_shared) | 9 | target_link_libraries(${NAME} fido2_shared) |
13 | add_custom_command(TARGET regress_assert POST_BUILD COMMAND regress_assert) | 10 | add_custom_command(TARGET regress POST_BUILD COMMAND ${NAME} |
11 | DEPENDS ${NAME}) | ||
12 | endmacro() | ||
14 | 13 | ||
15 | # dev | 14 | add_regress_test(regress_cred cred.c) |
16 | add_executable(regress_dev dev.c) | 15 | add_regress_test(regress_assert assert.c) |
17 | target_link_libraries(regress_dev fido2_shared) | 16 | add_regress_test(regress_dev dev.c) |
18 | add_custom_command(TARGET regress_dev POST_BUILD COMMAND regress_dev) | ||
diff --git a/regress/assert.c b/regress/assert.c index ebf0652..caa5725 100644 --- a/regress/assert.c +++ b/regress/assert.c | |||
@@ -216,12 +216,16 @@ empty_assert_tests(void) | |||
216 | fido_dev_io_t io_f; | 216 | fido_dev_io_t io_f; |
217 | int i; | 217 | int i; |
218 | 218 | ||
219 | memset(&io_f, 0, sizeof(io_f)); | ||
220 | |||
219 | a = alloc_assert(); | 221 | a = alloc_assert(); |
220 | d = alloc_dev(); | 222 | d = alloc_dev(); |
223 | |||
221 | io_f.open = dummy_open; | 224 | io_f.open = dummy_open; |
222 | io_f.close = dummy_close; | 225 | io_f.close = dummy_close; |
223 | io_f.read = dummy_read; | 226 | io_f.read = dummy_read; |
224 | io_f.write = dummy_write; | 227 | io_f.write = dummy_write; |
228 | |||
225 | assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK); | 229 | assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK); |
226 | 230 | ||
227 | empty_assert(d, a, 0); | 231 | empty_assert(d, a, 0); |
diff --git a/regress/cred.c b/regress/cred.c index 4998649..f8c08a4 100644 --- a/regress/cred.c +++ b/regress/cred.c | |||
@@ -333,10 +333,13 @@ empty_cred(void) | |||
333 | assert(fido_cred_x5c_ptr(c) == NULL); | 333 | assert(fido_cred_x5c_ptr(c) == NULL); |
334 | assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT); | 334 | assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT); |
335 | 335 | ||
336 | memset(&io_f, 0, sizeof(io_f)); | ||
337 | |||
336 | io_f.open = dummy_open; | 338 | io_f.open = dummy_open; |
337 | io_f.close = dummy_close; | 339 | io_f.close = dummy_close; |
338 | io_f.read = dummy_read; | 340 | io_f.read = dummy_read; |
339 | io_f.write = dummy_write; | 341 | io_f.write = dummy_write; |
342 | |||
340 | d = alloc_dev(); | 343 | d = alloc_dev(); |
341 | 344 | ||
342 | fido_dev_force_u2f(d); | 345 | fido_dev_force_u2f(d); |
diff --git a/regress/dev.c b/regress/dev.c index 39b3584..84a45cc 100644 --- a/regress/dev.c +++ b/regress/dev.c | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <assert.h> | 7 | #include <assert.h> |
8 | #include <fido.h> | 8 | #include <fido.h> |
9 | #include <string.h> | ||
9 | 10 | ||
10 | #define FAKE_DEV_HANDLE ((void *)0xdeadbeef) | 11 | #define FAKE_DEV_HANDLE ((void *)0xdeadbeef) |
11 | #define REPORT_LEN (64 + 1) | 12 | #define REPORT_LEN (64 + 1) |
@@ -53,6 +54,8 @@ open_iff_ok(void) | |||
53 | fido_dev_t *dev = NULL; | 54 | fido_dev_t *dev = NULL; |
54 | fido_dev_io_t io; | 55 | fido_dev_io_t io; |
55 | 56 | ||
57 | memset(&io, 0, sizeof(io)); | ||
58 | |||
56 | io.open = dummy_open; | 59 | io.open = dummy_open; |
57 | io.close = dummy_close; | 60 | io.close = dummy_close; |
58 | io.read = dummy_read; | 61 | io.read = dummy_read; |