diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-08-26 16:17:11 +0200 |
---|---|---|
committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-08-26 19:16:45 +0200 |
commit | 3c833171bd8360a43ab82ee80826113b278647e0 (patch) | |
tree | 4f8f908bd35ee1bcd375736ee2121ea143b2795d | |
parent | 10d7ed12c9aedae3055218452de452800c3ea39d (diff) | |
download | systemd-3c833171bd8360a43ab82ee80826113b278647e0.tar.gz |
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.
-rwxr-xr-x | test/TEST-08-ISSUE-2730/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-09-ISSUE-2691/test.sh | 2 | ||||
-rwxr-xr-x | test/TEST-11-ISSUE-3166/test.sh | 2 | ||||
-rwxr-xr-x | test/TEST-17-UDEV/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-18-FAILUREACTION/test.sh | 2 | ||||
-rwxr-xr-x | test/TEST-19-DELEGATE/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-31-DEVICE-ENUMERATION/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-50-DISSECT/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-64-UDEV-STORAGE/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-67-INTEGRITY/test.sh | 1 |
10 files changed, 0 insertions, 13 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 83557f22ec..0564314a86 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -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 "$@" diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index 1c995f4801..3fc243cc55 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -QEMU_TIMEOUT=300 - do_test "$@" diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh index 9adccc10b2..12dabd704d 100755 --- a/test/TEST-11-ISSUE-3166/test.sh +++ b/test/TEST-11-ISSUE-3166/test.sh @@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -QEMU_TIMEOUT=300 - do_test "$@" diff --git a/test/TEST-17-UDEV/test.sh b/test/TEST-17-UDEV/test.sh index 9d91eee204..6b8f08fc32 100755 --- a/test/TEST-17-UDEV/test.sh +++ b/test/TEST-17-UDEV/test.sh @@ -8,6 +8,5 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -QEMU_TIMEOUT=800 do_test "$@" diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh index a72365d0ec..c11aab1ea9 100755 --- a/test/TEST-18-FAILUREACTION/test.sh +++ b/test/TEST-18-FAILUREACTION/test.sh @@ -7,6 +7,4 @@ TEST_DESCRIPTION="FailureAction= operation" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -QEMU_TIMEOUT=600 - do_test "$@" diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh index 5623708312..1b50ac3ae7 100755 --- a/test/TEST-19-DELEGATE/test.sh +++ b/test/TEST-19-DELEGATE/test.sh @@ -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 "$@" diff --git a/test/TEST-31-DEVICE-ENUMERATION/test.sh b/test/TEST-31-DEVICE-ENUMERATION/test.sh index 01dd8744a7..107fa7de44 100755 --- a/test/TEST-31-DEVICE-ENUMERATION/test.sh +++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh @@ -8,6 +8,5 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -QEMU_TIMEOUT=300 do_test "$@" diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh index c6cd42d0a7..0940382d52 100755 --- a/test/TEST-50-DISSECT/test.sh +++ b/test/TEST-50-DISSECT/test.sh @@ -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 diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh index 80c60f19f7..07b5df1d82 100755 --- a/test/TEST-64-UDEV-STORAGE/test.sh +++ b/test/TEST-64-UDEV-STORAGE/test.sh @@ -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" diff --git a/test/TEST-67-INTEGRITY/test.sh b/test/TEST-67-INTEGRITY/test.sh index b3bc1441ab..1ec2d4bf7f 100755 --- a/test/TEST-67-INTEGRITY/test.sh +++ b/test/TEST-67-INTEGRITY/test.sh @@ -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" |