test: move {test,fuzz}-fido-id-desc.c into src/udev/fido_id

diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 96496ff4ed92faacc95597d1c9416ad6bd109cd8..c88812d1de9f7d83a26f7e9c52d19ac875179007 100644 (file)
--- 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 5132145b415fda960251d74c81dd9d8f1c60bcd6..6179607a4399ff19f4671cc3b5612f439c5d3277 100644 (file)
--- 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
similarity index 94%
rename from src/fuzz/fuzz-fido-id-desc.c
rename to src/udev/fido_id/fuzz-fido-id-desc.c
index cf98dee0446a0aaf7307f987ebc7df71757a8da1..45a4879e82ab89002d9152c8b2ccac03f522745c 100644 (file)
--- 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
similarity index 99%
rename from src/test/test-fido-id-desc.c
rename to src/udev/fido_id/test-fido-id-desc.c
index cf55dd32667dfb599859e210a8ded1936328a622..38eec2bc28d42b64a09cdced73262c5c6a411486 100644 (file)
--- 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 48573cdb6043f4ef9621eb58cd1087f31a0b9eb2..991d2eb24b1bdf74a2cac97c91d1cba2b27a5b6f 100644 (file)
--- 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'],
+         [],
+         []],
         ]