From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3D385A04DD; Sun, 15 Nov 2020 23:54:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 230EFC904; Sun, 15 Nov 2020 23:53:54 +0100 (CET) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by dpdk.org (Postfix) with ESMTP id 77A5FC8DC for ; Sun, 15 Nov 2020 23:53:51 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 6AD076F0; Sun, 15 Nov 2020 17:53:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 15 Nov 2020 17:53:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=1eK839gLZzXwq KXw6gdeODODbslC38HA+OiWfM2bZFE=; b=vucm48Tn55LN6W5OOJ7tKjJWppl7i vhDSRompLJ7nTVlGF2q9drjIfyQ1rBAy2tU8OTvKUpBS54ZRKTe2PVgbUr4bnYO7 q+3yEWBm5okEreF6tXAa8x00v7BKW18oseys1tutKs8OFXk5bceUG9WFR9Uuyg7z rbUhrtG+XugHWhawa78KbHDGEM+jv7CKifCGXpkXGYM3ZvlNuwIxUeK8faX0PTkq wtki6L5Ff9DQ3vWgquYaTx21T1wE/Cy6YFv5+BJ0AqvHLZqIxrJSNww9YQA9U7XR jxpKZBfdP1gfjM2TM5l+vI7DUJD+fXUxFhkZQQCNRfmJXRZSlGW/bQ/0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=1eK839gLZzXwqKXw6gdeODODbslC38HA+OiWfM2bZFE=; b=LqKSrKHi 17UP0/ewtp2YuVKGCiSkYezyTnw8kLmxnQu1QeOsK3jkimWVSlqBqzqm+RrDQc91 Au/+Bkg9j23JM9BDS5NWt6YSdvrfYogeU09Nt30HIlcBZOKsknGfWJB3ME6wREf7 qHEstoKs4ZUoP9dU/kcV+jo3BhQIUUHH6Ud1u6JxutWHYPL9LjcE7+t81dcF5QeY 5DuS/FYhEZP5+51VS75RFRVS3ahK3YWrcu9drYNmelKlo9M4tplMUeD2ED5jLiHj 2VsneslXVXsrj8ttplvtiht8ynSr2isk2R/Rs6k7nxTN2XAwtFFJfszFGZ2Bp15T 5xbJ4cYXdA5IlQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeftddgtdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpedvhefgiedvjeegtdevhe efhfetleefgfeivefgffevfeejgedtgfeutdehtdegveenucfkphepjeejrddufeegrddv tdefrddukeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 4692B3064AA6; Sun, 15 Nov 2020 17:53:49 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: stephen@networkplumber.org, david.marchand@redhat.com, bruce.richardson@intel.com, bluca@debian.org Date: Sun, 15 Nov 2020 23:53:19 +0100 Message-Id: <20201115225320.68408-4-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201115225320.68408-1-thomas@monjalon.net> References: <20200922143202.8755-1-stephen@networkplumber.org> <20201115225320.68408-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v11 3/4] test: rename blacklist/whitelist in autotest scripts X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger The options and variables are renamed to use block/allow terminology. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi Signed-off-by: Thomas Monjalon --- app/test/autotest.py | 16 ++++++++-------- app/test/autotest_runner.py | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/test/autotest.py b/app/test/autotest.py index 9eef1efbe5..6ff2e71475 100644 --- a/app/test/autotest.py +++ b/app/test/autotest.py @@ -10,7 +10,7 @@ def usage(): print("Usage: autotest.py [test app|test iso image] ", - "[target] [whitelist|-blacklist]") + "[target] [allow|-block]") if len(sys.argv) < 3: usage() @@ -18,18 +18,18 @@ def usage(): target = sys.argv[2] -test_whitelist = None -test_blacklist = None +test_allowlist = None +test_blocklist = None -# get blacklist/whitelist +# get blocklist/allowlist if len(sys.argv) > 3: testlist = sys.argv[3].split(',') testlist = [test.lower() for test in testlist] if testlist[0].startswith('-'): testlist[0] = testlist[0].lstrip('-') - test_blacklist = testlist + test_blocklist = testlist else: - test_whitelist = testlist + test_allowlist = testlist cmdline = "%s -c f" % (sys.argv[1]) @@ -39,8 +39,8 @@ def usage(): # processes, so make it 1, otherwise make it 4. ignored for non-parallel tests n_processes = 1 if "bsd" in target else 4 -runner = autotest_runner.AutotestRunner(cmdline, target, test_blacklist, - test_whitelist, n_processes) +runner = autotest_runner.AutotestRunner(cmdline, target, test_blocklist, + test_allowlist, n_processes) runner.parallel_tests = autotest_data.parallel_test_list[:] runner.non_parallel_tests = autotest_data.non_parallel_test_list[:] diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py index 998fe57a55..8aa4d45569 100644 --- a/app/test/autotest_runner.py +++ b/app/test/autotest_runner.py @@ -188,14 +188,14 @@ class AutotestRunner: n_tests = 0 fails = 0 log_buffers = [] - blacklist = [] - whitelist = [] + blocklist = [] + allowlist = [] - def __init__(self, cmdline, target, blacklist, whitelist, n_processes): + def __init__(self, cmdline, target, blocklist, allowlist, n_processes): self.cmdline = cmdline self.target = target - self.blacklist = blacklist - self.whitelist = whitelist + self.blocklist = blocklist + self.allowlist = allowlist self.skipped = [] self.parallel_tests = [] self.non_parallel_tests = [] @@ -269,7 +269,7 @@ def __process_result(self, result): self.csvwriter.writerow([test_name, test_result, result_str]) # this function checks individual test and decides if this test should be in - # the group by comparing it against whitelist/blacklist. it also checks if + # the group by comparing it against allowlist/blocklist. it also checks if # the test is compiled into the binary, and marks it as skipped if necessary def __filter_test(self, test): test_cmd = test["Command"] @@ -279,10 +279,10 @@ def __filter_test(self, test): if "_autotest" in test_id: test_id = test_id[:-len("_autotest")] - # filter out blacklisted/whitelisted tests - if self.blacklist and test_id in self.blacklist: + # filter out blocked/allowed tests + if self.blocklist and test_id in self.blocklist: return False - if self.whitelist and test_id not in self.whitelist: + if self.allowlist and test_id not in self.allowlist: return False # if test wasn't compiled in, remove it as well -- 2.28.0