system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #32812 from DaanDeMeyer/test

Browse source 
test: Only add tpm2.target dependency to TEST-70-TPM2.service
This commit is contained in:
Daan De Meyer 2024-05-14 20:50:38 +02:00 committed by GitHub
parent 0263816f88 aaebebb7bd
commit 2476c21272
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure
View file

@ -20,7 +20,7 @@ num_disk = 16
config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0,num_queues=4"]
for i in range(0, num_disk):
id = f"drivenamedpart{i}"
id = f"drive{i}"
config["QemuDrives"] += [
{
"Id": id,

4
test/TEST-70-TPM2/meson.build
View file

@ -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']),
},
},
]

2
test/meson.build
View file

@ -286,6 +286,8 @@ integration_test_template = {
'configuration' : {
'memory-accounting' : 'no',
'command' : testdata_dir / 'units/%N.sh',
'wants' : '',
'after' : '',
},
'cmdline' : [],
}

4
test/test.service.in
View file

@ -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]

2
test/units/TEST-64-UDEV-STORAGE.sh
View file

@ -250,7 +250,7 @@ testcase_virtio_scsi_identically_named_partitions() {
fi
for ((i = 0; i < num_disk; i++)); do
sfdisk "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drivenamedpart$i" <<EOF
sfdisk "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive$i" <<EOF
label: gpt
$(for ((j = 1; j <= num_part; j++)); do echo 'name="Hello world", size=2M'; done)