From nobody Tue Apr 16 08:22:31 2024 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 4VJcTz4YFtz5G721; Tue, 16 Apr 2024 08:22:31 +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 4VJcTz2s6Qz4v3x; Tue, 16 Apr 2024 08:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255751; 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=roEtQkFAC9GatESJSnFG1mFk09e1YlVF3wnbHUoKBgc=; b=Ieu5jWOyDOPS99wAQHXY1ImSXZCEkoLHgvV8mvXaWqTgtEuDXsVRQCwggX7aO4j5iDYIgK oUn4qPlQWMNFInes1j9t3L0rJw878BGUDfadSUZchyKR764/XG1rTe+5aF4r/IuIIU1Gg2 y5QG4GTdae0bi2xA8rSLEoZgdDFylN8ZGlDBnnmLJAjmCVp7z1qyrHODsNhNfuHHCUwiKm 0RyCKmZQRLpuP2G6+9cb1tl4nf2fmyxmloFdCtsXy3bLfQzHUg38qkLAM5C4GZQ9OmLRQC pCWoad9S7rE//CXkAC0PW4gdUZNGW+Zs0Bu89Mx3xjLBP0q0U86fugo5ED/eCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713255751; a=rsa-sha256; cv=none; b=UQr0uztispM+Ipw5vMISgTwyXF86gsqONKaeZ+vRzssS0srLh6vMHTORO/UN3eYUEMDzgV GX/ykQdv+BEFjWx5cVCeg+3LuFxLRnX1JCJ3s0cQCcf8rFODrwUI/CMyGUNv1mXepOVWnQ 4CK2HWbKCs8tu841I6pyPplOIWws3iMJS/BJfLjrJryBpYV/cJmAK2B2IeLroDzixOZVff 3xt7pF/kKrhc6eeDUvILT5X8fHsfTaWf2igoiKEj/RadCcK9QGu798aRiU/1jqVuaQtMHl wsYO0OOWDbZGJrdI+1MX6lu4Qf5B0HhiiuEB35/kcL/57LqioOT8N4wdjQizug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255751; 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=roEtQkFAC9GatESJSnFG1mFk09e1YlVF3wnbHUoKBgc=; b=xOyr14Ql0CETt6DdaU8RG3cJdqYXB/AoRooCiHBpTHIGJKY+EeC435ObIzIlqytHtoZ/3y SkKerPKu89V/eQ/HvYIsbqCu9lcRom5v0RGTxnjQ4DaoebMyvdacp2e3vjqFqg1ZKZCeyr 0RmVb3gGABihGJYSEPqRWLsZ+c+7C6AvjJVgE7KeW5SmUtNdqkXKy1MQ2TdO8iCSnUuISD k45G2SwD6N3xDSe9tLfXPB22otimDchHiezhO8p51mGxdnwAwJjxgOfbFCpYsHTZ+PaoKr tiyaOl0hHaivBGzUUZ9p93A4qSkd8Jkw6pfcyJQZnJQFUhr68sm49UWJNT8VRA== 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 4VJcTz2S0HzbwS; Tue, 16 Apr 2024 08:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43G8MVSp032101; Tue, 16 Apr 2024 08:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G8MVK8032098; Tue, 16 Apr 2024 08:22:31 GMT (envelope-from git) Date: Tue, 16 Apr 2024 08:22:31 GMT Message-Id: <202404160822.43G8MVK8032098@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: 219d8fb0361f - main - stress2: Add an option to exit on error 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 219d8fb0361f459ab458f17fe58da32ea00c0104 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=219d8fb0361f459ab458f17fe58da32ea00c0104 commit 219d8fb0361f459ab458f17fe58da32ea00c0104 Author: Peter Holm AuthorDate: 2024-04-16 08:22:03 +0000 Commit: Peter Holm CommitDate: 2024-04-16 08:22:03 +0000 stress2: Add an option to exit on error --- tools/test/stress2/misc/all.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/all.sh b/tools/test/stress2/misc/all.sh index 605c9958b552..86d986099dbb 100755 --- a/tools/test/stress2/misc/all.sh +++ b/tools/test/stress2/misc/all.sh @@ -42,14 +42,15 @@ alloutput=$sdir/output # Output from current test allexcess=$sdir/excessive # Tests with excessive runtime allelapsed=$sdir/elapsed # Test runtime alllocal=$sdir/all.exclude # Local exclude list +exitonerror=0 # -e option loops=0 # Times to run the tests # Get kernel config + revision rev=`uname -a | awk '{print $7}' | sed 's/://'` rev="`uname -a | sed 's#.*/compile/##; s/ .*//'` $rev" -args=`getopt acl:m:no "$@"` +args=`getopt acel:m:no "$@"` [ $? -ne 0 ] && - echo "Usage $0 [-a] [-c] [-l ] [-m ] [-n] [-o] []" && + echo "Usage $0 [-a] [-c] [-e] [-l ] [-m ] [-n] [-o] []" && exit 1 set -- $args for i; do @@ -62,6 +63,9 @@ for i; do rm -f $alllist shift ;; + -e) exitonerror=1 + shift + ;; -l) loops=$2 # Number of time to run shift; shift ;; @@ -160,6 +164,7 @@ trap intr INT [ -f all.debug.inc ] && . all.debug.inc s1=`date +%s` +touch $sdir/starttime while true; do exclude=`cat all.exclude $alllocal 2>/dev/null | sed '/^#/d' | grep "^[a-zA-Z].*\.sh" | awk '{print $1}'` @@ -226,6 +231,7 @@ while true; do [ $e -ne 0 ] && echo "FAIL $i exit code $e" ) 2>&1 | tee $alloutput + grep -qw FAIL $alloutput && e=1 || e=0 ts=`date '+%Y%m%d %T'` grep -qw FAIL $alloutput && echo "$ts $rev $i" >> $allfaillog && @@ -247,6 +253,7 @@ while true; do [ $all_debug ] && post_debug [ $minutes ] && [ $((`date +%s` - s1)) -ge $minutes ] && break 2 + [ $exitonerror -eq 1 -a $e -ne 0 ] && break 2 done [ $((loops -= 1)) -eq 0 ] && break done