From nobody Wed Apr 13 09:08:23 2022 X-Original-To: dev-commits-src-main@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 D753A1AFCF32; Wed, 13 Apr 2022 09:08:24 +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 4KdcFh2rG0z4msN; Wed, 13 Apr 2022 09:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649840904; 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=OruPjOOBIHxw3QfI2irtF5L4XirXeLodrtIoHT9aPQk=; b=o9YEnh78UxxVBu3qPyh2/3JLrG4IW5KWMx2k0h0m2wCVnDGfSP1X/AUEsyxsxXD72nCFgZ 6Gt7DxgWdXQo4KgxhipsALCeJCp0xIwwBD/Q3mBl+E+Wt+CdZ/t/pDo/RMk530052dHz/P c3/eL6Pw1KDAGKLgZmpuuL86e3IhCqdr2qyiFIgYE3a0s+vrre0wQm01fi0CPspRrimxKO UqKP0b0wkQ36EhsGcKBqOwUfyO1/U/skIAmILgdH1ppQk34dVq3BKcygGUdCxWKBju55se drlwRQhE6ZYhwU0goCIh4TO9m5McYSBctkd2H5XlUk24sLQ8MvJhDUlZhHqunA== 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 05912DE1; Wed, 13 Apr 2022 09:08:24 +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 23D98NdF039263; Wed, 13 Apr 2022 09:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D98Nf4039262; Wed, 13 Apr 2022 09:08:23 GMT (envelope-from git) Date: Wed, 13 Apr 2022 09:08:23 GMT Message-Id: <202204130908.23D98Nf4039262@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: 2f0baec1ecb2 - main - stress2: Fix cleanup after test run List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2f0baec1ecb2e79cfb97a19e1bbfb27741365847 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649840904; 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=OruPjOOBIHxw3QfI2irtF5L4XirXeLodrtIoHT9aPQk=; b=Cc4AfaOohYFaLCB5eFYF1QKAXJem87wbjVBcKG7c9gw3wZhykIx843bHfhSWM+D1FapZMm WpQQVUbVYYlBB7pfQK9TbScmdTrH8XJwAVYDfcXWrFVJTarpGalhJ2cU7vMKoY5GnqYD4Q ACyJwdUPxD+6wuELfMA/VmG/JniYAAVHVjjvOa4iz4oy2WWu338TW0RGngsjefzAOrM0C5 2VV4wGpItmJg+B4oHEGzXeg3Nmac6fhteHAi4jfxT5V+131Tqm4Te394piSg3Q5q9bBdsX Qcp6wVsdUsECGchJSkSfDgsRXnCruvlrBD8S8JhHT8Ddp5edr/zhO9oX/t5Qrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649840904; a=rsa-sha256; cv=none; b=LQozvlnkJFWtyV6IxCdJ6jsJ5gSM6mUHocYDsbE7ez1yIlK9MzSpV137nrOKbSz8hua3Hd Gn2PgMlbRVPBT7nj2tuA1dEAU9BuEtU69poY0sxTD3bEz4I1MNvN/exd7eOVGZe4OYu3Ec qo8IsBxtHkaPpeBrSzJD6vouuHIV3nqwPKVHf6w7+iVdfH6XqDn4Jn+VZ+fVKXDRnS0r8B ng2VzyfSYJunAJ1Ogpa/baUjaCKW9JuGbPgYFT7ZOSWCkohiaIwESeA8PIuRdIyo/ni50m ONXTpgNITGNJH12GzBLXiJp8tRBrWwQ6TYW0CSrLlZ8DkSMlsByHqfFgkPfJRw== 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=2f0baec1ecb2e79cfb97a19e1bbfb27741365847 commit 2f0baec1ecb2e79cfb97a19e1bbfb27741365847 Author: Peter Holm AuthorDate: 2022-04-13 09:07:49 +0000 Commit: Peter Holm CommitDate: 2022-04-13 09:07:49 +0000 stress2: Fix cleanup after test run --- tools/test/stress2/misc/force4.sh | 2 +- tools/test/stress2/misc/syzkaller16.sh | 3 ++- tools/test/stress2/misc/syzkaller17.sh | 3 ++- tools/test/stress2/misc/syzkaller18.sh | 3 ++- tools/test/stress2/misc/syzkaller19.sh | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/force4.sh b/tools/test/stress2/misc/force4.sh index b1b05dc54efa..72932aec1fe6 100755 --- a/tools/test/stress2/misc/force4.sh +++ b/tools/test/stress2/misc/force4.sh @@ -82,7 +82,7 @@ done sleep 1 ../tools/killall.sh wait -umount $mp2 +mount | grep -q "on $mp2 " && umount $mp2 n=0 while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 diff --git a/tools/test/stress2/misc/syzkaller16.sh b/tools/test/stress2/misc/syzkaller16.sh index 4ded2f61388f..8671b46474ac 100755 --- a/tools/test/stress2/misc/syzkaller16.sh +++ b/tools/test/stress2/misc/syzkaller16.sh @@ -410,7 +410,8 @@ mycc -o /tmp/syzkaller16 -Wall -Wextra -O0 -m32 /tmp/syzkaller16.c -pthread || (cd ../testcases/swap; ./swap -t 1m -i 20 -h > /dev/null 2>&1) & (cd /tmp; ./syzkaller16) & sleep 60 -pkill -9 syzkaller16 swap +pkill -9 syzkaller16 +while pkill swap; do sleep 1; done wait rm -f /tmp/syzkaller16 /tmp/syzkaller16.c /tmp/syzkaller16.core diff --git a/tools/test/stress2/misc/syzkaller17.sh b/tools/test/stress2/misc/syzkaller17.sh index 94b33771c59c..1e3f3ec2eb91 100755 --- a/tools/test/stress2/misc/syzkaller17.sh +++ b/tools/test/stress2/misc/syzkaller17.sh @@ -124,7 +124,8 @@ while pgrep -q swap; do (cd /tmp; timeout 1m ./syzkaller17) [ $((`date +%s` - start)) -ge 60 ] && break done -pkill -9 syzkaller17 swap +pkill -9 syzkaller17 +while pkill swap; do sleep 1; done wait rm -f /tmp/syzkaller17 /tmp/syzkaller17.c /tmp/syzkaller17.core diff --git a/tools/test/stress2/misc/syzkaller18.sh b/tools/test/stress2/misc/syzkaller18.sh index 12432d23bc65..6a1d41c33084 100755 --- a/tools/test/stress2/misc/syzkaller18.sh +++ b/tools/test/stress2/misc/syzkaller18.sh @@ -121,7 +121,8 @@ while pgrep -q swap; do (cd /tmp; timeout 1m ./syzkaller18) [ $((`date +%s` - start)) -ge 60 ] && break done -pkill -9 syzkaller18 swap +pkill -9 syzkaller18 +while pkill swap; do sleep 1; done wait rm -f /tmp/syzkaller18 /tmp/syzkaller18.c /tmp/syzkaller18.core diff --git a/tools/test/stress2/misc/syzkaller19.sh b/tools/test/stress2/misc/syzkaller19.sh index 651f444203e4..b36b12e524f2 100755 --- a/tools/test/stress2/misc/syzkaller19.sh +++ b/tools/test/stress2/misc/syzkaller19.sh @@ -164,7 +164,8 @@ mycc -o /tmp/syzkaller19 -Wall -Wextra -O2 /tmp/syzkaller19.c -lpthread || (cd ../testcases/swap; ./swap -t 1m -i 20 -h > /dev/null 2>&1) & (cd /tmp; ./syzkaller19) & sleep 60 -pkill -9 syzkaller19 swap +pkill -9 syzkaller19 +while pkill swap; do sleep 1; done wait rm -f /tmp/syzkaller19 /tmp/syzkaller19.c /tmp/syzkaller19.core