From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 14 May 2024 13:35:59 +0000 (+0200)
Subject: test: Only add tpm2.target dependency to TEST-70-TPM2.service
X-Git-Tag: v256-rc2~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d9b8f3476350cbfaf644c9b0fd67ec7b33c7398;p=thirdparty%2Fsystemd.git

test: Only add tpm2.target dependency to TEST-70-TPM2.service

Let's not add the dependency unless required.
---

diff --git a/test/TEST-70-TPM2/meson.build b/test/TEST-70-TPM2/meson.build
index 8dec5f37e73..4e0bf908746 100644
--- a/test/TEST-70-TPM2/meson.build
+++ b/test/TEST-70-TPM2/meson.build
@@ -3,5 +3,9 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'configuration' : integration_test_template['configuration'] + {
+                        'wants' : '@0@ tpm2.target'.format(integration_test_template['configuration']['wants']),
+                        'after' : '@0@ tpm2.target'.format(integration_test_template['configuration']['after']),
+                },
         },
 ]
diff --git a/test/meson.build b/test/meson.build
index 61aa01089a9..60d42efee65 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -286,6 +286,8 @@ integration_test_template = {
         'configuration' : {
                 'memory-accounting' : 'no',
                 'command' : testdata_dir / 'units/%N.sh',
+                'wants' : '',
+                'after' : '',
         },
         'cmdline' : [],
 }
diff --git a/test/test.service.in b/test/test.service.in
index 71e3618ec37..57f2afbce1a 100644
--- a/test/test.service.in
+++ b/test/test.service.in
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=%N
-Wants=basic.target network.target tpm2.target multi-user.target user@4711.service
-After=basic.target network.target tpm2.target user@4711.service
+Wants=basic.target network.target multi-user.target user@4711.service @wants@
+After=basic.target network.target user@4711.service @after@
 Before=getty-pre.target
 
 [Service]