mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
test: respect the global $QEMU_TIMEOUT
CIs set QEMU and nspawn timeouts by themselves which reflect their needs and possibilities, so let's respect that value, instead of using one pre-set value which might or might not work for all of them. Both Ubuntu CI and CentOS CI set these values themselves.
This commit is contained in:
parent
10d7ed12c9
commit
3c833171bd
@ -9,7 +9,6 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=300
|
||||
TEST_FORCE_NEWIMAGE=1
|
||||
|
||||
do_test "$@"
|
||||
|
@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=300
|
||||
|
||||
do_test "$@"
|
||||
|
@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=300
|
||||
|
||||
do_test "$@"
|
||||
|
@ -8,6 +8,5 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=800
|
||||
|
||||
do_test "$@"
|
||||
|
@ -7,6 +7,4 @@ TEST_DESCRIPTION="FailureAction= operation"
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=600
|
||||
|
||||
do_test "$@"
|
||||
|
@ -8,7 +8,6 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=600
|
||||
UNIFIED_CGROUP_HIERARCHY=yes
|
||||
|
||||
do_test "$@"
|
||||
|
@ -8,6 +8,5 @@ TEST_NO_NSPAWN=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=300
|
||||
|
||||
do_test "$@"
|
||||
|
@ -12,7 +12,6 @@ TEST_INSTALL_VERITY_MINIMAL=1
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
||||
QEMU_TIMEOUT=1200
|
||||
|
||||
command -v mksquashfs >/dev/null 2>&1 || exit 0
|
||||
command -v veritysetup >/dev/null 2>&1 || exit 0
|
||||
|
@ -12,7 +12,6 @@ TEST_DESCRIPTION="systemd-udev storage tests"
|
||||
TEST_NO_NSPAWN=1
|
||||
# Save only journals of failing test cases by default (to conserve space)
|
||||
TEST_SAVE_JOURNAL="${TEST_SAVE_JOURNAL:-fail}"
|
||||
QEMU_TIMEOUT="${QEMU_TIMEOUT:-600}"
|
||||
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
@ -5,7 +5,6 @@ set -e
|
||||
TEST_DESCRIPTION="dm-integrity test"
|
||||
|
||||
TEST_NO_NSPAWN=1
|
||||
QEMU_TIMEOUT=600
|
||||
|
||||
# shellcheck source=test/test-functions
|
||||
. "${TEST_BASE_DIR:?}/test-functions"
|
||||
|
Loading…
Reference in New Issue
Block a user