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

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'],
-         [],
-         []]
 ]

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'],
-         [],
-         []],
 ]
 
 ############################################################

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"
 

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) {

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'],
+         [],
+         []],
         ]