diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2025-06-04 10:18:40 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2025-06-04 10:18:40 +0200 |
| commit | 238b9656a1c9c4d18a21dbc67e1c150c2f1a5191 (patch) | |
| tree | 24405eb7933016ba5abbe64cf576e925d75214d8 | |
| parent | 1875e4c6957ecc9a7cc864e5232bd4826811df9f (diff) | |
| download | debvm-238b9656a1c9c4d18a21dbc67e1c150c2f1a5191.tar.gz | |
Force tests to not use smp
According to Michael, a key ingredient to reproducing #1106792 is
concurrency. By disabling smp, we skip the problem
Closes: #1106397
| -rwxr-xr-x | tests/create-and-run.sh | 4 | ||||
| -rwxr-xr-x | tests/dist-upgrades.sh | 4 | ||||
| -rwxr-xr-x | tests/efi-create-and-run.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh index d401327..9788790 100755 --- a/tests/create-and-run.sh +++ b/tests/create-and-run.sh @@ -61,8 +61,8 @@ elif test -n "$MIRROR"; then fi debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -r "$RELEASE" "$@" -# Many CPUs tend to cause test timeouts on tcg emulation. -export OMP_THREAD_LIMIT=4 +# Work around qemu #1106792 +export OMP_THREAD_LIMIT=1 SSH_PORT=2222 timeout 600s debvm-run -s "$SSH_PORT" -i "$IMAGE" & diff --git a/tests/dist-upgrades.sh b/tests/dist-upgrades.sh index c05c9d6..e79a57c 100755 --- a/tests/dist-upgrades.sh +++ b/tests/dist-upgrades.sh @@ -43,8 +43,8 @@ ssh-keygen -f "$SSH_KEYPATH" -N '' debvm-create --sshkey="$SSH_KEYPATH.pub" -r jessie --size=3G -- --customize-hook="copy-in upgrade /usr/local/bin" http://archive.debian.org/debian -# Many CPUs tend to cause test timeouts on tcg emulation. -export OMP_THREAD_LIMIT=4 +# Work around qemu #1106792 +export OMP_THREAD_LIMIT=1 SSH_PORT=2222 for RELEASE in stretch buster bullseye bookworm trixie sid; do diff --git a/tests/efi-create-and-run.sh b/tests/efi-create-and-run.sh index ed6b64e..6347743 100755 --- a/tests/efi-create-and-run.sh +++ b/tests/efi-create-and-run.sh @@ -36,8 +36,8 @@ if test -z "$RELEASE"; then fi debefivm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -r "$RELEASE" -a "$ARCHITECTURE" "$@" -# Many CPUs tend to cause test timeouts on tcg emulation. -export OMP_THREAD_LIMIT=4 +# Work around qemu #1106792 +export OMP_THREAD_LIMIT=1 SSH_PORT=2222 timeout 600s debefivm-run -s "$SSH_PORT" -i "$IMAGE" & |