From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 31 Oct 2019 01:37:42 +0000 (+0900)
Subject: test: move {test,fuzz}-fido-id-desc.c into src/udev/fido_id
X-Git-Tag: v244-rc1~119^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=9648956d1f01d9e0f3c45840b4a38582225716ee

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 96496ff4ed9..c88812d1de9 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 5132145b415..6179607a439 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
similarity index 94%
rename from src/fuzz/fuzz-fido-id-desc.c
rename to src/udev/fido_id/fuzz-fido-id-desc.c
index cf98dee0446..45a4879e82a 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
similarity index 99%
rename from src/test/test-fido-id-desc.c
rename to src/udev/fido_id/test-fido-id-desc.c
index cf55dd32667..38eec2bc28d 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 48573cdb604..991d2eb24b1 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'],
+         [],
+         []],
         ]