summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-10-31 10:37:42 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-10-31 10:37:42 +0900
commit9648956d1f01d9e0f3c45840b4a38582225716ee (patch)
tree43e32a33d29864f73fef80cfa53090fda63ba224
parent20bae8b94d34d75fe2572738e466abc37563bf88 (diff)
downloadsystemd-9648956d1f01d9e0f3c45840b4a38582225716ee.tar.gz
test: move {test,fuzz}-fido-id-desc.c into src/udev/fido_id
-rw-r--r--src/fuzz/meson.build5
-rw-r--r--src/test/meson.build5
-rw-r--r--src/udev/fido_id/fuzz-fido-id-desc.c (renamed from src/fuzz/fuzz-fido-id-desc.c)2
-rw-r--r--src/udev/fido_id/test-fido-id-desc.c (renamed from src/test/test-fido-id-desc.c)2
-rw-r--r--src/udev/meson.build14
5 files changed, 15 insertions, 13 deletions
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 96496ff4ed..c88812d1de 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -146,9 +146,4 @@ fuzzers += [
[['src/fuzz/fuzz-time-util.c'],
[libshared],
[]],
-
- [['src/fuzz/fuzz-fido-id-desc.c',
- 'src/udev/fido_id/fido_id_desc.c'],
- [],
- []]
]
diff --git a/src/test/meson.build b/src/test/meson.build
index 5132145b41..6179607a43 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -775,11 +775,6 @@ tests += [
[['src/test/test-local-addresses.c'],
[],
[]],
-
- [['src/test/test-fido-id-desc.c',
- 'src/udev/fido_id/fido_id_desc.c'],
- [],
- []],
]
############################################################
diff --git a/src/fuzz/fuzz-fido-id-desc.c b/src/udev/fido_id/fuzz-fido-id-desc.c
index cf98dee044..45a4879e82 100644
--- a/src/fuzz/fuzz-fido-id-desc.c
+++ b/src/udev/fido_id/fuzz-fido-id-desc.c
@@ -5,7 +5,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "fido_id/fido_id_desc.h"
+#include "fido_id_desc.h"
#include "fuzz.h"
#include "log.h"
diff --git a/src/test/test-fido-id-desc.c b/src/udev/fido_id/test-fido-id-desc.c
index cf55dd3266..38eec2bc28 100644
--- a/src/test/test-fido-id-desc.c
+++ b/src/udev/fido_id/test-fido-id-desc.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "fido_id/fido_id_desc.h"
+#include "fido_id_desc.h"
#include "macro.h"
static void test_is_fido_security_token_desc__fido(void) {
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 48573cdb60..991d2eb24b 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -208,5 +208,17 @@ fuzzers += [
libsystemd_network,
libshared],
[threads,
- libacl]]
+ libacl]],
+
+ [['src/udev/fido_id/fuzz-fido-id-desc.c',
+ 'src/udev/fido_id/fido_id_desc.c'],
+ [],
+ []],
+ ]
+
+tests += [
+ [['src/udev/fido_id/test-fido-id-desc.c',
+ 'src/udev/fido_id/fido_id_desc.c'],
+ [],
+ []],
]