From patchwork Fri Sep 27 12:57:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1168481 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46fsJl2MmGz9sPK for ; Fri, 27 Sep 2019 22:57:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727128AbfI0M50 (ORCPT ); Fri, 27 Sep 2019 08:57:26 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:49858 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727088AbfI0M50 (ORCPT ); Fri, 27 Sep 2019 08:57:26 -0400 Received: from localhost ([::1]:34716 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1iDpoL-0005i7-7Q; Fri, 27 Sep 2019 14:57:25 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH] iptables-test: Run tests in lexical order Date: Fri, 27 Sep 2019 14:57:16 +0200 Message-Id: <20190927125716.1769-1-phil@nwl.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org To quickly see if a given test was run or not, sort the file list. Also filter non-test files right when preparing the list. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- iptables-test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iptables-test.py b/iptables-test.py index 2aac8ef2256dc..fdb4e6a3644e4 100755 --- a/iptables-test.py +++ b/iptables-test.py @@ -359,10 +359,14 @@ def main(): print("Couldn't open log file %s" % LOGFILE) return - file_list = [os.path.join(EXTENSIONS_PATH, i) - for i in os.listdir(EXTENSIONS_PATH)] if args.filename: file_list = [args.filename] + else: + file_list = [os.path.join(EXTENSIONS_PATH, i) + for i in os.listdir(EXTENSIONS_PATH) + if i.endswith('.t')] + file_list.sort() + for filename in file_list: file_tests, file_passed = run_test_file(filename, args.netns) if file_tests: