mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
Merge pull request #9201 from poettering/integration-test-unfuck
make the integration tests great again
This commit is contained in:
commit
d5e9c5a2cd
@ -1,4 +1,4 @@
|
||||
#!/bin/bash -e
|
||||
#!/bin/bash -ex
|
||||
|
||||
# Test merging of a --job-mode=ignore-dependencies job into a previously
|
||||
# installed job.
|
||||
|
@ -3,6 +3,7 @@
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
set -e
|
||||
TEST_DESCRIPTION="Job-related tests"
|
||||
TEST_NO_QEMU=1
|
||||
|
||||
. $TEST_BASE_DIR/test-functions
|
||||
|
||||
@ -27,6 +28,8 @@ After=multi-user.target
|
||||
[Service]
|
||||
ExecStart=/test-jobs.sh
|
||||
Type=oneshot
|
||||
StandardOutput=tty
|
||||
StandardError=tty
|
||||
EOF
|
||||
|
||||
# copy the units used by this test
|
||||
|
@ -11,7 +11,7 @@ TEST_NO_NSPAWN=1
|
||||
# selinux-policy-devel
|
||||
|
||||
# Check if selinux-policy-devel is installed, and if it isn't bail out early instead of failing
|
||||
test -d /usr/share/selinux/devel || exit 0
|
||||
test -f /usr/share/selinux/devel/include/system/systemd.if || exit 0
|
||||
|
||||
. $TEST_BASE_DIR/test-functions
|
||||
SETUP_SELINUX=yes
|
||||
|
@ -4,6 +4,7 @@
|
||||
set -e
|
||||
TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
|
||||
SKIP_INITRD=yes
|
||||
TEST_NO_QEMU=1
|
||||
|
||||
. $TEST_BASE_DIR/test-functions
|
||||
|
||||
|
@ -124,6 +124,7 @@ loglevel=2 \
|
||||
init=$ROOTLIBDIR/systemd \
|
||||
console=ttyS0 \
|
||||
selinux=0 \
|
||||
printk.devkmsg=on \
|
||||
$_cgroup_args \
|
||||
$KERNEL_APPEND \
|
||||
"
|
||||
|
Loading…
Reference in New Issue
Block a user