From 1d3ef11dfe9d59d0d8a5eeeee401b372124923e9 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 30 Sep 2023 19:18:34 +0900
Subject: [PATCH] journal: move several tests to libsystemd/sd-journal

This also renames test-journal-xyz for journald (rather than sd-journal)
to test-journald-xyz.
---
 src/journal/meson.build                       | 24 ++-----------------
 ...ournal-config.c => test-journald-config.c} |  0
 ...ournal-syslog.c => test-journald-syslog.c} |  0
 src/libsystemd/meson.build                    | 12 ++++++++++
 .../sd-journal}/test-journal-append.c         |  0
 .../sd-journal}/test-journal-flush.c          |  0
 .../sd-journal}/test-journal-interleaving.c   |  0
 .../sd-journal}/test-journal-stream.c         |  0
 .../sd-journal}/test-journal-verify.c         |  0
 .../sd-journal}/test-journal.c                |  0
 10 files changed, 14 insertions(+), 22 deletions(-)
 rename src/journal/{test-journal-config.c => test-journald-config.c} (100%)
 rename src/journal/{test-journal-syslog.c => test-journald-syslog.c} (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal-append.c (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal-flush.c (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal-interleaving.c (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal-stream.c (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal-verify.c (100%)
 rename src/{journal => libsystemd/sd-journal}/test-journal.c (100%)

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 6ae5cfbf9d9..a3aa8ad5ee1 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -103,11 +103,7 @@ executables += [
                 ],
         },
         journal_test_template + {
-                'sources' : files('test-journal-append.c'),
-                'type' : 'manual',
-        },
-        journal_test_template + {
-                'sources' : files('test-journal-config.c'),
+                'sources' : files('test-journald-config.c'),
                 'dependencies' : [
                         liblz4,
                         libselinux,
@@ -115,16 +111,7 @@ executables += [
                 ],
         },
         journal_test_template + {
-                'sources' : files('test-journal-flush.c'),
-        },
-        journal_test_template + {
-                'sources' : files('test-journal-interleaving.c'),
-        },
-        journal_test_template + {
-                'sources' : files('test-journal-stream.c'),
-        },
-        journal_test_template + {
-                'sources' : files('test-journal-syslog.c'),
+                'sources' : files('test-journald-syslog.c'),
                 'dependencies' : [
                         liblz4,
                         libselinux,
@@ -132,13 +119,6 @@ executables += [
                         threads,
                 ],
         },
-        journal_test_template + {
-                'sources' : files('test-journal-verify.c'),
-                'timeout' : 90,
-        },
-        journal_test_template + {
-                'sources' : files('test-journal.c'),
-        },
         journal_fuzz_template + {
                 'sources' : files(
                         'fuzz-journald-audit.c',
diff --git a/src/journal/test-journal-config.c b/src/journal/test-journald-config.c
similarity index 100%
rename from src/journal/test-journal-config.c
rename to src/journal/test-journald-config.c
diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journald-syslog.c
similarity index 100%
rename from src/journal/test-journal-syslog.c
rename to src/journal/test-journald-syslog.c
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index bcf8e1faf8e..5d18f974bae 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -172,6 +172,10 @@ simple_tests += files(
         'sd-device/test-sd-device-monitor.c',
         'sd-device/test-sd-device.c',
         'sd-event/test-event.c',
+        'sd-journal/test-journal-flush.c',
+        'sd-journal/test-journal-interleaving.c',
+        'sd-journal/test-journal-stream.c',
+        'sd-journal/test-journal.c',
         'sd-login/test-login.c',
         'sd-netlink/test-netlink.c',
 )
@@ -234,6 +238,14 @@ libsystemd_tests += [
                 'dependencies' : threads,
                 'timeout' : 120,
         },
+        {
+                'sources' : files('sd-journal/test-journal-append.c'),
+                'type' : 'manual',
+        },
+        {
+                'sources' : files('sd-journal/test-journal-verify.c'),
+                'timeout' : 90,
+        },
         {
                 'sources' : files('sd-resolve/test-resolve.c'),
                 'dependencies' : threads,
diff --git a/src/journal/test-journal-append.c b/src/libsystemd/sd-journal/test-journal-append.c
similarity index 100%
rename from src/journal/test-journal-append.c
rename to src/libsystemd/sd-journal/test-journal-append.c
diff --git a/src/journal/test-journal-flush.c b/src/libsystemd/sd-journal/test-journal-flush.c
similarity index 100%
rename from src/journal/test-journal-flush.c
rename to src/libsystemd/sd-journal/test-journal-flush.c
diff --git a/src/journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c
similarity index 100%
rename from src/journal/test-journal-interleaving.c
rename to src/libsystemd/sd-journal/test-journal-interleaving.c
diff --git a/src/journal/test-journal-stream.c b/src/libsystemd/sd-journal/test-journal-stream.c
similarity index 100%
rename from src/journal/test-journal-stream.c
rename to src/libsystemd/sd-journal/test-journal-stream.c
diff --git a/src/journal/test-journal-verify.c b/src/libsystemd/sd-journal/test-journal-verify.c
similarity index 100%
rename from src/journal/test-journal-verify.c
rename to src/libsystemd/sd-journal/test-journal-verify.c
diff --git a/src/journal/test-journal.c b/src/libsystemd/sd-journal/test-journal.c
similarity index 100%
rename from src/journal/test-journal.c
rename to src/libsystemd/sd-journal/test-journal.c
-- 
2.39.5