diff options
| -rw-r--r-- | test/TEST-70-TPM2/meson.build | 4 | ||||
| -rw-r--r-- | test/meson.build | 2 | ||||
| -rw-r--r-- | test/test.service.in | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/TEST-70-TPM2/meson.build b/test/TEST-70-TPM2/meson.build index 8dec5f37e7..4e0bf90874 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 61aa01089a..60d42efee6 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 71e3618ec3..57f2afbce1 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] |