From owner-dev-commits-src-all@freebsd.org Wed May 26 06:09:28 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D0A3634DA1; Wed, 26 May 2021 06:09:28 +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 4FqgWr3nX8z3qNt; Wed, 26 May 2021 06:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6A6313847; Wed, 26 May 2021 06:09:28 +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 14Q69ScY087359; Wed, 26 May 2021 06:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14Q69SdH087358; Wed, 26 May 2021 06:09:28 GMT (envelope-from git) Date: Wed, 26 May 2021 06:09:28 GMT Message-Id: <202105260609.14Q69SdH087358@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: 79f27053e4e0 - main - stress2: Fix cleanup on exit 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: 79f27053e4e072afaf808c06e59c734b72e82c9b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 06:09:28 -0000 The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=79f27053e4e072afaf808c06e59c734b72e82c9b commit 79f27053e4e072afaf808c06e59c734b72e82c9b Author: Peter Holm AuthorDate: 2021-05-26 06:05:55 +0000 Commit: Peter Holm CommitDate: 2021-05-26 06:05:55 +0000 stress2: Fix cleanup on exit --- tools/test/stress2/misc/force7.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/force7.sh b/tools/test/stress2/misc/force7.sh index 9eef1936cb98..1e987bc13a72 100755 --- a/tools/test/stress2/misc/force7.sh +++ b/tools/test/stress2/misc/force7.sh @@ -71,5 +71,10 @@ while [ $((`date +%s` - start)) -lt 300 ]; do fsck_ffs -fyR /dev/md$mdstart > $log 2>&1; s=$? [ $s -ne 0 ] && break done -[ $s -eq 0 ] && rm -f $diskimage $log || cat $log +if [ $s -eq 0 ]; then + mdconfig -d -u $mdstart + rm -f $diskimage $log +else + cat $log +fi exit $s