mirror of
https://github.com/systemd/systemd.git
synced 2024-11-07 18:27:04 +03:00
b2ecd099dc
If run_qemu() exits with non-zero, this either meant that QEMU was not available (which should be a SKIP) or that QEMU timed out if $QEMU_TIMEOUT was set (which then should be a FAIL). Limit the exit code of run_qemu() to QEMU availability only, and track timeouts separately through the new $TIMED_OUT variable, which is then checked in check_result_qemu(). Do the same for $NSPAWN_TIMEOUT and run_nspawn() so that nspawn and QEMU work similarly.
81 lines
2.1 KiB
Bash
Executable File
81 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2691"
|
|
|
|
. $TEST_BASE_DIR/test-functions
|
|
SKIP_INITRD=yes
|
|
QEMU_TIMEOUT=90
|
|
|
|
check_result_qemu() {
|
|
ret=1
|
|
mkdir -p $TESTDIR/root
|
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
|
[[ -e $TESTDIR/root/testok ]] && ret=0
|
|
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
|
cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
|
umount $TESTDIR/root
|
|
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
|
ls -l $TESTDIR/journal/*/*.journal
|
|
test -s $TESTDIR/failed && ret=$(($ret+1))
|
|
[ -n "$TIMED_OUT" ] && ret=$(($ret+1))
|
|
return $ret
|
|
}
|
|
|
|
test_run() {
|
|
if run_qemu; then
|
|
check_result_qemu || return 1
|
|
else
|
|
dwarn "can't run QEMU, skipping"
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
test_setup() {
|
|
create_empty_image
|
|
mkdir -p $TESTDIR/root
|
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
|
|
|
# Create what will eventually be our root filesystem onto an overlay
|
|
(
|
|
LOG_LEVEL=5
|
|
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
|
|
|
setup_basic_environment
|
|
|
|
# setup the testsuite service
|
|
cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
|
|
[Unit]
|
|
Description=Testsuite service
|
|
After=multi-user.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
ExecStart=/bin/sh -c '>/testok'
|
|
RemainAfterExit=yes
|
|
ExecStop=/bin/sh -c 'kill -SEGV $$$$'
|
|
TimeoutStopSec=180s
|
|
EOF
|
|
|
|
setup_testsuite
|
|
) || return 1
|
|
|
|
# mask some services that we do not want to run in these tests
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
|
|
|
ddebug "umount $TESTDIR/root"
|
|
umount $TESTDIR/root
|
|
}
|
|
|
|
test_cleanup() {
|
|
umount $TESTDIR/root 2>/dev/null
|
|
[[ $LOOPDEV ]] && losetup -d $LOOPDEV
|
|
return 0
|
|
}
|
|
|
|
do_test "$@"
|