From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 28 Aug 2022 02:59:44 +0000 (+0900)
Subject: test-64: relax number of partitions used in testcase_simultaneous_events() to speed... 
X-Git-Tag: v252-rc1~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1bed4e41df622019619ed502648032a749a2602;p=thirdparty%2Fsystemd.git

test-64: relax number of partitions used in testcase_simultaneous_events() to speed up non-KVM environment
---

diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 4b654260f35..2b35758213d 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -153,7 +153,7 @@ EOF
 }
 
 testcase_simultaneous_events() {
-    local blockdev iterations part partscript timeout
+    local blockdev iterations num_part part partscript timeout
 
     blockdev="$(readlink -f /dev/disk/by-id/scsi-*_deadbeeftest)"
     partscript="$(mktemp)"
@@ -163,8 +163,18 @@ testcase_simultaneous_events() {
         return 1
     fi
 
+    if [[ -n "${ASAN_OPTIONS:-}" ]] || [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
+        num_part=10
+        iterations=10
+        timeout=240
+    else
+        num_part=50
+        iterations=100
+        timeout=30
+    fi
+
     cat >"$partscript" <<EOF
-$(printf 'name="test%d", size=2M\n' {1..50})
+$(for ((i = 1; i <= num_part; i++)); do printf 'name="test%d", size=2M\n' "$i"; done)
 EOF
 
     # Initial partition table
@@ -176,13 +186,6 @@ EOF
     #
     # On unpatched udev versions the delete-recreate cycle may trigger a race
     # leading to dead symlinks in /dev/disk/
-    iterations=100
-    timeout=30
-    if [[ -n "${ASAN_OPTIONS:-}" ]] || [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
-        iterations=10
-        timeout=240
-    fi
-
     for ((i = 1; i <= iterations; i++)); do
         udevadm lock --device="$blockdev" sfdisk -q --delete "$blockdev"
         udevadm lock --device="$blockdev" sfdisk -q -X gpt "$blockdev" <"$partscript"