diff --git a/test/units/TEST-58-REPART.sh b/test/units/TEST-58-REPART.sh index 7b536fa0920..df6f935c980 100755 --- a/test/units/TEST-58-REPART.sh +++ b/test/units/TEST-58-REPART.sh @@ -20,6 +20,13 @@ export PAGER=cat # Disable use of special glyphs such as → export SYSTEMD_UTF8=0 +# Sanitizer runs are significantly slower, so give udevadm wait 3 times longer timeouts +if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then + UDEVADM_WAIT_TIMEOUT=180 +else + UDEVADM_WAIT_TIMEOUT=60 +fi + seed=750b6cd5c4ae4012a15e7be3c29e6a47 esp_guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B @@ -378,7 +385,7 @@ $imgs/zzz7 : start= 6291416, size= 131072, type=3B8F8425-20E0-4F3B-907F fi loop="$(losetup -P --show --find "$imgs/zzz")" - udevadm wait --timeout=60 --settle "${loop:?}p7" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p7" cryptsetup luksDump "${loop}p7" | grep 'Flags:[[:space:]]*allow-discards' >/dev/null @@ -438,7 +445,7 @@ $imgs/zzz7 : start= 6291416, size= 131072, type=3B8F8425-20E0-4F3B-907F $imgs/zzz8 : start= 6422488, size= 131072, type=4D21B016-B534-45C2-A9FB-5C16E091FD2D, uuid=329B9DB2-DFD9-4F39-8EBF-53B582B05FCD, name=\"luks-no-discards\", attrs=\"GUID:59\"" loop="$(losetup -P --show --find "$imgs/zzz")" - udevadm wait --timeout=60 --settle "${loop:?}p8" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p8" cryptsetup luksDump "${loop}p8" | grep 'Flags:[[:space:]]*(no flags)' >/dev/null losetup -d "$loop" @@ -1058,7 +1065,7 @@ EOF # shellcheck disable=SC2064 trap "rm -rf '$defs' '$imgs' ; losetup -d '$loop'" RETURN ERR - udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" "${loop:?}p2" # Check that the verity block sizes are as expected veritysetup dump "${loop}p2" | grep 'Data block size:' | grep '4096' >/dev/null @@ -1118,7 +1125,7 @@ EOF # shellcheck disable=SC2064 trap "rm -rf '$defs' '$imgs' ; losetup -d '$loop'" RETURN ERR - udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" "${loop:?}p2" output=$(sfdisk -J "$loop") @@ -1200,7 +1207,7 @@ EOF fi loop=$(losetup -P --show -f "$imgs/zzz") - udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" "${loop:?}p2" # Test that /usr/def did not end up in the root partition but other files did. mkdir "$imgs/mnt" @@ -1425,7 +1432,7 @@ EOF truncate -s 100m "$imgs/$sector.img" loop=$(losetup -b "$sector" -P --show -f "$imgs/$sector.img" ) - udevadm wait --timeout=60 --settle "${loop:?}" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}" systemd-repart --offline="$OFFLINE" \ --pretty=yes \ @@ -1808,7 +1815,7 @@ EOF # shellcheck disable=SC2064 trap "umount '$imgs/mount' 2>/dev/null || true; losetup -d '$loop' 2>/dev/null || true; rm -rf '$defs' '$imgs'" RETURN echo "Loop device: $loop" - udevadm wait --timeout=60 --settle "${loop:?}p1" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" mkdir -p "$imgs/mount" mount -t btrfs "${loop:?}p1" "$imgs/mount" @@ -1936,7 +1943,7 @@ EOF "$imgs/encint.img" loop="$(losetup -P --show --find "$imgs/encint.img")" - udevadm wait --timeout=60 --settle "${loop:?}p1" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" volume="test-repart-luksint-$RANDOM" dmstatus="$imgs/dmsetup-$RANDOM" @@ -2041,7 +2048,7 @@ EOF "$imgs/enckeyhash.img" loop="$(losetup -P --show --find "$imgs/enckeyhash.img")" - udevadm wait --timeout=60 --settle "${loop:?}p1" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" touch "$imgs/empty-password" @@ -2101,7 +2108,7 @@ EOF "$imgs/fstabcrypttabrepart.img" loop="$(losetup -P --show --find "$imgs/fstabcrypttabrepart.img")" - udevadm wait --timeout=60 --settle "${loop:?}p1" + udevadm wait --timeout="$UDEVADM_WAIT_TIMEOUT" --settle "${loop:?}p1" touch "$imgs/empty-password"