mirror of
https://github.com/systemd/systemd
synced 2024-07-23 03:04:57 +00:00
Merge pull request #33157 from DaanDeMeyer/end
test: Run end.sh when running integration tests with mkosi
This commit is contained in:
commit
9619fdc102
|
@ -30,7 +30,8 @@ static VARLINK_DEFINE_METHOD(
|
||||||
VARLINK_DEFINE_OUTPUT(FirmwareDate, VARLINK_INT, VARLINK_NULLABLE),
|
VARLINK_DEFINE_OUTPUT(FirmwareDate, VARLINK_INT, VARLINK_NULLABLE),
|
||||||
VARLINK_DEFINE_OUTPUT(MachineID, VARLINK_STRING, 0),
|
VARLINK_DEFINE_OUTPUT(MachineID, VARLINK_STRING, 0),
|
||||||
VARLINK_DEFINE_OUTPUT(BootID, VARLINK_STRING, 0),
|
VARLINK_DEFINE_OUTPUT(BootID, VARLINK_STRING, 0),
|
||||||
VARLINK_DEFINE_OUTPUT(ProductUUID, VARLINK_STRING, VARLINK_NULLABLE));
|
VARLINK_DEFINE_OUTPUT(ProductUUID, VARLINK_STRING, VARLINK_NULLABLE),
|
||||||
|
VARLINK_DEFINE_OUTPUT(VSockCID, VARLINK_INT, VARLINK_NULLABLE));
|
||||||
|
|
||||||
VARLINK_DEFINE_INTERFACE(
|
VARLINK_DEFINE_INTERFACE(
|
||||||
io_systemd_Hostname,
|
io_systemd_Hostname,
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
#include "varlink-io.systemd.PCRLock.h"
|
#include "varlink-io.systemd.PCRLock.h"
|
||||||
|
|
||||||
static VARLINK_DEFINE_METHOD(
|
static VARLINK_DEFINE_METHOD(
|
||||||
ReadEventLog);
|
ReadEventLog,
|
||||||
|
VARLINK_DEFINE_OUTPUT(record, VARLINK_OBJECT, 0));
|
||||||
|
|
||||||
static VARLINK_DEFINE_METHOD(
|
static VARLINK_DEFINE_METHOD(
|
||||||
MakePolicy,
|
MakePolicy,
|
||||||
|
|
|
@ -129,7 +129,7 @@ static VARLINK_DEFINE_METHOD(
|
||||||
|
|
||||||
static VARLINK_DEFINE_STRUCT_TYPE(
|
static VARLINK_DEFINE_STRUCT_TYPE(
|
||||||
ResolvedRecord,
|
ResolvedRecord,
|
||||||
VARLINK_DEFINE_FIELD(ifindex, VARLINK_INT, 0),
|
VARLINK_DEFINE_FIELD(ifindex, VARLINK_INT, VARLINK_NULLABLE),
|
||||||
VARLINK_DEFINE_FIELD_BY_TYPE(rr, ResourceRecord, VARLINK_NULLABLE),
|
VARLINK_DEFINE_FIELD_BY_TYPE(rr, ResourceRecord, VARLINK_NULLABLE),
|
||||||
VARLINK_DEFINE_FIELD(raw, VARLINK_STRING, 0));
|
VARLINK_DEFINE_FIELD(raw, VARLINK_STRING, 0));
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,5 @@ StopWhenUnneeded=yes
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStartPre=rm -f /failed /testok
|
ExecStartPre=rm -f /failed /testok
|
||||||
Type=exec
|
Type=oneshot
|
||||||
TimeoutStartSec=infinity
|
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
||||||
ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
||||||
ExecStart=true
|
|
||||||
|
|
|
@ -71,6 +71,7 @@ def main():
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
StandardOutput=journal+console
|
StandardOutput=journal+console
|
||||||
|
ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
Description=End the test
|
Description=End the test
|
||||||
After=testsuite.target
|
After=testsuite.target
|
||||||
OnFailure=poweroff.target
|
OnFailure=poweroff.target
|
||||||
|
OnSuccess=poweroff.target
|
||||||
OnFailureJobMode=replace-irreversibly
|
OnFailureJobMode=replace-irreversibly
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
|
|
@ -13,5 +13,4 @@ set -o pipefail
|
||||||
(! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed)
|
(! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed)
|
||||||
(! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed)
|
(! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed)
|
||||||
|
|
||||||
systemctl poweroff --no-block
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in a new issue