From nobody Fri Aug 19 09:43:01 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M8GyY2dtBz4Yb12; Fri, 19 Aug 2022 09:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M8GyY25j0z3pTf; Fri, 19 Aug 2022 09:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660902181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33xKVEUMCrb+xn2QsTIQPs+pBiUE/s69dgI7OgkjMZA=; b=HRCvd0smVCwIQD0/UPHKied1OHu/Ei7V8ZBscgW5aoCfnGNygQ+WQGeJPGtjDaD67O7YpP kazLB1lwYw/Fmj7iMaT6jdIOnNTQwqRJJxAydjZjcah/ShwLADharNYhgsL3aAQH13bCcu NzSzSVBlapywtO9wrCW+2REQ68AvT3a4JcqezKGQA+Nl5GUwDznw02KjHhkUTfwwDrTasg wIkMJzWJNZNDan7LvFjSTls6h2pVeLDxZHv4TrtCMqY+D6VeCPsYB33qVYbqJX52+iKtiQ KeVvUyAmnYnvoKdmba+50P66z2YEeri0uxfU6G61CH/xDaoWRsAn8Avm5toK0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M8GyY18Tqzp2X; Fri, 19 Aug 2022 09:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27J9h1Al098205; Fri, 19 Aug 2022 09:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J9h1AD098204; Fri, 19 Aug 2022 09:43:01 GMT (envelope-from git) Date: Fri, 19 Aug 2022 09:43:01 GMT Message-Id: <202208190943.27J9h1AD098204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 98b13e25fd9c - main - stress2: Handle different spelling of "superblock" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98b13e25fd9c773032e8ea6667ffbf65d244ac1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660902181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33xKVEUMCrb+xn2QsTIQPs+pBiUE/s69dgI7OgkjMZA=; b=dgIhTf88uhoXaAQyKVSXAmcSHxQNmk5mq/goPCV5EMlgvIw3YI4IADlB9s2vwyLebkrVR4 eG2RPT6bFF1UB+tEPQFkRSZrMh+i00frJ6CGi2rKW4Zh+sEU9KUogBi63+x94INz5lYi6c oQLh6LmKQKeVhR+feUfS4wBAEFT1TSk9sLmpdCpg5yA0CO3LZSdzDI/CRKkIAU0mAZTsgM LZZhzfbZK1VcUyV7iY3Mg0bU/lxZtV1B3GICWML3YTMU3tf73fVaDF6tP0D39PGLlJb1YX w+7KnIniFrC1SmOoaS5Q4aafbGK6++DUmWk1Ve2ITpdDMPqvN7ZPyuyPs2xXgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660902181; a=rsa-sha256; cv=none; b=BaB1uipV8/qN+ZwJRuUqbuXvS4mGOIVkw/39dqO+7prMB8l07Koa7MFu6EOxGmRfinZbl8 Yl1rZYsr9xLH1PPa0K+JmkS8JXOQeFHqrL/+QubxA1s2AKLC+Jhvm77HM7se816mS5MkQb NE+NO9cq/8CMA+0zcSTP0CkP10wjbRdIXrEIam7Tu4OhA/x11dIrQB9j6RPIlm4PCAGwkT 03Ty4alLQQ9Zo5xCneGifwz/s4jxr0pDmMdl1cXd1c/ecpi4CybxQKnzmhCpwM0zmeIeJ4 e2uKU0/JkXirLDH+Kq0oxIgt46rnoKQEl0gKUs4GT4hlvpo+I/EWgJD9unPEbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=98b13e25fd9c773032e8ea6667ffbf65d244ac1f commit 98b13e25fd9c773032e8ea6667ffbf65d244ac1f Author: Peter Holm AuthorDate: 2022-08-19 09:39:28 +0000 Commit: Peter Holm CommitDate: 2022-08-19 09:39:28 +0000 stress2: Handle different spelling of "superblock" --- tools/test/stress2/misc/fsck.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/fsck.sh b/tools/test/stress2/misc/fsck.sh index 826c31f733c3..972150dc6fac 100755 --- a/tools/test/stress2/misc/fsck.sh +++ b/tools/test/stress2/misc/fsck.sh @@ -86,13 +86,13 @@ chk() { waccess=0 fsck_ffs -fy $1 > $log 2>&1 r=$? - if grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log; then + if grep -qiE "super-?block.*failed" $log; then for b in $backups; do echo "Using alternate SB $b" asbs=$((asbs + 1)) fsck_ffs -b $b -fy $1 > $log 2>&1 r=$? - grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log || + grep -qiE "super-?block.*failed" $log || break done usedasb=1