Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp4764764img; Tue, 26 Mar 2019 16:44:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIcX/5AJxdk9HBb0DksUDpNVWOeiVCfrHQJlFrIWUmP8odxKsAEPNvlA58mQ8l7iXyYOub X-Received: by 2002:a63:5a4b:: with SMTP id k11mr31039337pgm.119.1553643852793; Tue, 26 Mar 2019 16:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553643852; cv=none; d=google.com; s=arc-20160816; b=Ri0X/IjzujX/NCeDdnaWUizbj9c7CJEbZCdqigvF3k/lLpCnSKZ4JaA7J6yWf/PYqL wPGG3xYZNRyavONjA3/kohdLEUzpFjSqlYYnCq+6TGp6xfBOLqfFFfIYfUu+iCX2TlrQ ztQa0mqtKBGWnaRuybZB3KOmbvTYzmcBPt6wn+cp9CbwcwtMi7bUEI8ByVE571YJx5VH 1+v6v5x0I4pQjwukIVqyjVVGv9HYdv3qewRWl9zjsR9AZitIe+ZC8TkGETT7OIYM8OVG zUY9YCHj/RmXV0FL3KEc3XiHda9oiGINvvBoEqK+q3i6J4x4pB0K5Rx6ujnCVK9POBg+ 3nhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=RmjGzxkHvo+xEPOieqCM8Vv1Unx13JbS6ING12E7pxE=; b=bYSfd3XYjdeVizLDkyjWe2r66BTnrH4nSddGovtlHtNBukQDdYTX8/LVH+Ta0euXAP QugX4jC6k8ZptZ4gbIqqoWNlWBLceGSjNVbXUwEV8rvFYY95THyDbKW7I06K+IVLVd6p MwLtVsE7yBp5hDvbMIMfBwRa73Lk13JcuTBZTHP3gEDrluYYVl/6m5Q1ALxv8xagKxY2 ItWr0th3kIeSZN+kegE8rECQV4gdxCP+9W7Ls+i5v9Fd+AMlXT3TcLxyQJLB0/lTn7k3 ikGAYyp4UakBKH3iLDwyBoF2BS7JKoJ6t8ditTGGaghoa8egjbzNTIpkuGnuwbNRUyvu Bz3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a15si1973578pgd.166.2019.03.26.16.43.57; Tue, 26 Mar 2019 16:44:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733257AbfCZXmx (ORCPT + 99 others); Tue, 26 Mar 2019 19:42:53 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54934 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732689AbfCZXlm (ORCPT ); Tue, 26 Mar 2019 19:41:42 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2QNXtfg004830 for ; Tue, 26 Mar 2019 19:41:40 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0b-001b2d01.pphosted.com with ESMTP id 2rfvt9t8cm-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2019 19:41:40 -0400 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Mar 2019 23:41:39 -0000 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 26 Mar 2019 23:41:35 -0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2QNfY0T17301628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Mar 2019 23:41:34 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D272B205F; Tue, 26 Mar 2019 23:41:34 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5E23AB2067; Tue, 26 Mar 2019 23:41:34 +0000 (GMT) Received: from paulmck-ThinkPad-W541 (unknown [9.70.82.188]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 26 Mar 2019 23:41:34 +0000 (GMT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id 7E04116C6090; Tue, 26 Mar 2019 16:41:35 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, mingo@kernel.org Cc: stern@rowland.harvard.edu, andrea.parri@amarulasolutions.com, will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com, npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr, akiyks@gmail.com, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 05/21] tools/memory-model: Make judgelitmus.sh note timeouts Date: Tue, 26 Mar 2019 16:41:17 -0700 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190326234114.GA23843@linux.ibm.com> References: <20190326234114.GA23843@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19032623-0068-0000-0000-000003AB7675 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010820; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000282; SDB=6.01180142; UDB=6.00617577; IPR=6.00960857; MB=3.00026170; MTD=3.00000008; XFM=3.00000015; UTC=2019-03-26 23:41:38 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19032623-0069-0000-0000-000047F22997 Message-Id: <20190326234133.24962-5-paulmck@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-26_15:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903260159 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, judgelitmus.sh treats timeouts (as in the "--timeout" argument) as "!!! Verification error". This can be misleading because it is quite possible that running the test longer would have produced a verification. This commit therefore changes judgelitmus.sh to check for timeouts and to report them with "!!! Timeout". Signed-off-by: Paul E. McKenney --- tools/memory-model/scripts/judgelitmus.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh index 0cc63875e395..d3c313b9a458 100755 --- a/tools/memory-model/scripts/judgelitmus.sh +++ b/tools/memory-model/scripts/judgelitmus.sh @@ -42,6 +42,14 @@ grep '^Observation' $LKMM_DESTDIR/$litmus.out if grep -q '^Observation' $LKMM_DESTDIR/$litmus.out then : +elif grep '^Command exited with non-zero status 124' $LKMM_DESTDIR/$litmus.out +then + echo ' !!! Timeout' $litmus + if ! grep -q '!!!' $LKMM_DESTDIR/$litmus.out + then + echo ' !!! Timeout' >> $LKMM_DESTDIR/$litmus.out 2>&1 + fi + exit 124 else echo ' !!! Verification error' $litmus if ! grep -q '!!!' $LKMM_DESTDIR/$litmus.out -- 2.17.1