Date: Wed, 5 Feb 2025 13:55:43 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 6180d0382df2 - main - Cirrus-CI: Check for final "Uptime" message Message-ID: <202502051355.515DthVT012956@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6180d0382df2a7537e0ef7e33b18058f30329e8e commit 6180d0382df2a7537e0ef7e33b18058f30329e8e Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-02-03 18:09:23 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-02-05 13:54:02 +0000 Cirrus-CI: Check for final "Uptime" message The last thing printed by the kernel after shutdown is Uptime: <time>. In the CI boot test script add a check for this, to ensure that shutdown is successful. A test branch of mine panicked during shutdown, but still reported success in Cirrus-CI. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48823 --- tools/boot/ci-qemu-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/boot/ci-qemu-test.sh b/tools/boot/ci-qemu-test.sh index faa360db1a2c..63f0fc2c64b2 100755 --- a/tools/boot/ci-qemu-test.sh +++ b/tools/boot/ci-qemu-test.sh @@ -125,8 +125,8 @@ timeout 300 \ -snapshot -hda $hda 2>&1 | tee ${BOOTLOG} # Check whether we succesfully booted... -if grep -q 'Hello world.' ${BOOTLOG}; then - echo "OK" +if grep -q 'Hello world.' ${BOOTLOG} && egrep -q '^Uptime: ' ${BOOTLOG}; then + echo "Boot successful" else die "Did not boot successfully, see ${BOOTLOG}" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502051355.515DthVT012956>