linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bobby Eshleman <bobbyeshleman@gmail.com>
To: Stefano Garzarella <sgarzare@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org,
	 linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Bobby Eshleman <bobbyeshleman@meta.com>,
	Simon Horman <horms@kernel.org>
Subject: [PATCH net-next v3 05/11] selftests/vsock: do not unconditionally die if qemu fails
Date: Thu, 06 Nov 2025 16:49:49 -0800	[thread overview]
Message-ID: <20251106-vsock-selftests-fixes-and-improvements-v3-5-519372e8a07b@meta.com> (raw)
In-Reply-To: <20251106-vsock-selftests-fixes-and-improvements-v3-0-519372e8a07b@meta.com>

From: Bobby Eshleman <bobbyeshleman@meta.com>

If QEMU fails to boot, then set the returncode (via timeout) instead of
unconditionally dying. This is in preparation for tests that expect QEMU
to fail to boot. In that case, we just want to know if the boot failed
or not so we can test the pass/fail criteria, and continue executing the
next test.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
---
 tools/testing/selftests/vsock/vmtest.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh
index a461ef1fcc61..ede74add070a 100755
--- a/tools/testing/selftests/vsock/vmtest.sh
+++ b/tools/testing/selftests/vsock/vmtest.sh
@@ -246,10 +246,8 @@ vm_start() {
 		--append "${KERNEL_CMDLINE}" \
 		--rw  &> ${logfile} &
 
-	if ! timeout ${WAIT_TOTAL} \
-		bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then
-		die "failed to boot VM"
-	fi
+	timeout "${WAIT_TOTAL}" \
+		bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'
 }
 
 vm_wait_for_ssh() {

-- 
2.47.3


  parent reply	other threads:[~2025-11-07  0:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-07  0:49 [PATCH net-next v3 00/11] selftests/vsock: refactor and improve vmtest infrastructure Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 01/11] selftests/vsock: improve logging in vmtest.sh Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 02/11] selftests/vsock: make wait_for_listener() work even if pipefail is on Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 03/11] selftests/vsock: reuse logic for vsock_test through wrapper functions Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 04/11] selftests/vsock: avoid multi-VM pidfile collisions with QEMU Bobby Eshleman
2025-11-07 15:08   ` Simon Horman
2025-11-07 15:35     ` Bobby Eshleman
2025-11-07  0:49 ` Bobby Eshleman [this message]
2025-11-07  0:49 ` [PATCH net-next v3 06/11] selftests/vsock: speed up tests by reducing the QEMU pidfile timeout Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 07/11] selftests/vsock: add check_result() for pass/fail counting Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 08/11] selftests/vsock: add BUILD=0 definition Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 09/11] selftests/vsock: add 1.37 to tested virtme-ng versions Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 10/11] selftests/vsock: add vsock_loopback module loading Bobby Eshleman
2025-11-07  0:49 ` [PATCH net-next v3 11/11] selftests/vsock: disable shellcheck SC2317 and SC2119 Bobby Eshleman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251106-vsock-selftests-fixes-and-improvements-v3-5-519372e8a07b@meta.com \
    --to=bobbyeshleman@gmail.com \
    --cc=bobbyeshleman@meta.com \
    --cc=horms@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sgarzare@redhat.com \
    --cc=shuah@kernel.org \
    --cc=virtualization@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).