Message ID | 20240123000604.1211486-5-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp39805dyi; Mon, 22 Jan 2024 16:28:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+46jCybL6YKyjgq8sz2jkEkhp0MXeFB7PF0NyP4KAY7sdqAJkaY8turBRzdniHxlaj2Py X-Received: by 2002:a05:6830:20d0:b0:6dd:ec51:5bb6 with SMTP id z16-20020a05683020d000b006ddec515bb6mr3570343otq.67.1705969707493; Mon, 22 Jan 2024 16:28:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705969707; cv=pass; d=google.com; s=arc-20160816; b=uJjh5PwY6s/7qFvV7aNNJRnDrFt3uATupr2eFRLDbjzNCI9e+yYmiNdSVDy+01W/OB NiYJ4rptFnjU6WjARvKLmgugyIcZFvJyQdV/bGQnD5KkpskJmcZO7isSVwil+i79RKxq /QT/fII6d/CIdcCZrmpyIvq7jcdGzMdQxTSPj+1Jo+//0KWLi9X6z6lerSsE8YJIl/Wq ituOrcqXpZ5mSVzn85vpRL25xsu7cGqymFRzxwCIbCT9D8ZgJGao3RUtBGaFgQmnIPwz RLpAeqsO7aCeb10yadJeWSh7I9Kou/xkFT77lZ6xufOw7LuzcFk6HqQ6pFoHczYINhTe 0/cg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=q79azOTXwSlimUfkUpJ2p/ZsQdIQmqJ7jFQrY/iqycY=; fh=OSPvvrodhCXrbS0tgWY7ZQ1FjQjyOgKyIFsZYsPrQ8s=; b=NGRH6JWX1xuiYufVBZabj+8fcnDB3vB8W8Ulkj1sMJ6We66N65FkaFI9npfiAsf6sG UucZUMdgXPjuPJWCtSqb02ItAMcQVCxeIUb/SDvLkuU5SJZworwM9Q8Bm7cppPHKwLa3 l+pkydmWEkwFRGDAtOTIb0stttSMQVChnEGpnbyoZSmxhalN/LrXF+KOpjT/DLMGGIlr 5vGYzdo8OCYzqpH3zGYIOn86g2noE2Q8HS5Ra4THiRHPk9GnbIxsfKShpRqZy1tpxPDX ZrKKFGlWRnWxzxsb1NEC0aIZKfP5ICAVOkzeuFvuBcOfnKGEbSN9/fhlY3mZ9DTZvE8l JfSw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=gmr27no4; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id du1-20020a05620a47c100b0078394eddfc4si5616155qkb.599.2024.01.22.16.28.27 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 16:28:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=gmr27no4; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34439-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4783B1C27F8F for <ouuuleilei@gmail.com>; Tue, 23 Jan 2024 00:28:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A5CD21482F0; Tue, 23 Jan 2024 00:06:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gmr27no4" Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A10CE1474A5 for <linux-kernel@vger.kernel.org>; Tue, 23 Jan 2024 00:06:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705968383; cv=none; b=L2A9/8882Fr48P2m3Xve699v2SiUGEY0rujYjT5mr3U3FgNhkT6NrQ4EJL7XF9otvzoJ3vmZiFJf0YdoFHavk5pW824/ial71VxL+AFyt+EmbE2A9jGYG6Qy1avXlF3xgXlyFbY4gSRGXk1mUUTIVzGA4W2zV9GBeqh5HYxcZ18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705968383; c=relaxed/simple; bh=IEvafp8noNqOSfOmOKDMTOQOH5/R9XopGqVio4nEPyc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ZfiY1Rupx6uuqsUdpxS5P5H2V7YJ2ROvv+XT9uBz/ti66RJthhKX8mzdDKz1+DAY7I8bcn2RIGx4/zOC+SoUfndIs8i+MI1aZNKbiy15NtrqAfgwN5KmeHpjuyqxlLlVW4G3sAj2ks1z4/GHHuzoq/YlaPBv4JHZMznHMgp+tWo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gmr27no4; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc24eb13fecso4685816276.0 for <linux-kernel@vger.kernel.org>; Mon, 22 Jan 2024 16:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1705968381; x=1706573181; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=q79azOTXwSlimUfkUpJ2p/ZsQdIQmqJ7jFQrY/iqycY=; b=gmr27no4HkxKA6Oy5axRfTVGcB5pDb4hJOHV1Xf8ZPXxlh2gEmoozDSJo40O/9tzpd vg6ds6KjHZoVDxQgDs5sPUJnx5rWUxP11jck4JG9De9atfJo/8I+dX1InkRiVqFwFrzB Bk+Fr0hm8AqexjBS8lXDvtn0v6tz5GnMWXcpd+COIv4+ySgMTOlq/7ElmVK/aiy19LgO AxICSAwWVE/CycYPutxKp+p0gqhcIbNe4n8hWTW7Lr2+ikVoUd/ISM71i/gggjricoBB spbs6sP62Quo5WdTumzJe6n9TbKrmYBbW9hGTgWZlLWk0uMuz4sn2FJoh+DvKiCR20DC 2sXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705968381; x=1706573181; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q79azOTXwSlimUfkUpJ2p/ZsQdIQmqJ7jFQrY/iqycY=; b=JgdCsbvnutlwqNfVG345hvv4XAb+9wO29KdAHzYW4NjmKyqh91wu3zMbjH9tN3RL2+ hTmCl2nuX846aUoiCxmrvbMLfcoLLNKPyNMzkHsUEWzUvsjxar8hHt38voNKjH6kKJyj 4mbH0qoLPiissV03RgCUFJzn+lGzxchL4rXKDtWLFXVrsn/Xu6mPpgqKrKxAJqRS8pGh YV/vMu+afAX1z4C5aIYrBHq/WUdEroy6MfJ/M6Id6Plz0coDWm5lkiYTk5ehw3cHn9Is E3uRIRO+jdQt1WT8mdsy5cq6rShb0LbaAb+/Mfn+PxgIkoQtkDSl36elsZndRG0Q6Mgq IzEQ== X-Gm-Message-State: AOJu0Yx39bHVfT3VHIVfglUMc0Sax4Qnd3wb/3oCO6GS6xL9pAJD8SLz wQmtBewyXwn5ksiC3rSrNYoIsDsscAI+9azlcaUJy/WUVklHSLIyxLPxjdqCkQzZcXHioZg2AQ/ kOofrnA== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:6aba:f97a:4dc7:7e92]) (user=irogers job=sendgmr) by 2002:a05:6902:352:b0:dc3:696e:ffae with SMTP id e18-20020a056902035200b00dc3696effaemr438504ybs.3.1705968380873; Mon, 22 Jan 2024 16:06:20 -0800 (PST) Date: Mon, 22 Jan 2024 16:06:03 -0800 In-Reply-To: <20240123000604.1211486-1-irogers@google.com> Message-Id: <20240123000604.1211486-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> Mime-Version: 1.0 References: <20240123000604.1211486-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Subject: [PATCH v1 4/5] perf test: Fix script test for python being disabled From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Ross Zwisler <zwisler@chromium.org>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, Shirisha G <shirisha@linux.ibm.com>, Kajol Jain <kjain@linux.ibm.com>, Kan Liang <kan.liang@linux.intel.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788838891916945011 X-GMAIL-MSGID: 1788838891916945011 |
Series |
Fixes for 6.8 PR1
|
|
Commit Message
Ian Rogers
Jan. 23, 2024, 12:06 a.m. UTC
"grep -cv" can exit with an error code that causes the "set -e" to
abort the script. Switch to using the grep exit code in the if
condition to avoid this.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/shell/script.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/perf/tests/shell/script.sh b/tools/perf/tests/shell/script.sh index 5ae7bd0031a8..b43077dbaf98 100755 --- a/tools/perf/tests/shell/script.sh +++ b/tools/perf/tests/shell/script.sh @@ -36,8 +36,7 @@ test_db() echo "DB test" # Check if python script is supported - libpython=$(perf version --build-options | grep python | grep -cv OFF) - if [ "${libpython}" != "1" ] ; then + if perf version --build-options | grep python | grep -q OFF ; then echo "SKIP: python scripting is not supported" err=2 return