From patchwork Wed Mar 15 01:56:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ke Xu X-Patchwork-Id: 125130 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0E78641E98; Wed, 15 Mar 2023 02:59:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09CDB427F2; Wed, 15 Mar 2023 02:59:33 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 7034B400EF for ; Wed, 15 Mar 2023 02:59:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678845571; x=1710381571; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Hwfvl/RdaXuSw1wArKHqFRzGtDD/gC/gOkZFEpFKOFE=; b=mmNDB/kb2pCvZrV//yGaQ+6yjADx5o65BH4968B4MSrswuk95lVBIOAU CsFLfyBnk7gXfSfTnoytfeM0iySsSyKQGL5wQZPqAnwSoTGeiAlFkqSeU rafuJ1C5gAe6L07J7p+QjIdwfa6LaKl3NDUy983zHPMjqFZZiwirLhbq7 g/igcgrIdydqbWgANAJG6huDKKNWbV56DzshsBVKtNF8KFVTQPClzkBon Q0rtCB02xijzpjsJtk/ThQdVGvRGtPPDk8jSoZm+pt9eBPaGwjIbY78Yk lTp9janmHXtErR1vGFNREr2nWc/++/QEedZf1Z7T6YOMv1dFWwCoyg2gZ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="317244197" X-IronPort-AV: E=Sophos;i="5.98,261,1673942400"; d="scan'208";a="317244197" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 18:59:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="672561444" X-IronPort-AV: E=Sophos;i="5.98,261,1673942400"; d="scan'208";a="672561444" Received: from dpdk-xuke-lab.sh.intel.com ([10.67.119.8]) by orsmga007.jf.intel.com with ESMTP; 14 Mar 2023 18:59:29 -0700 From: Ke Xu To: dts@dpdk.org Cc: lijuan.tu@intel.com, ke1.xu@intel.com Subject: [DTS][PATCH V2 2/2] framework/dts: fix result output by merging cases when parsing execution requirements. Date: Wed, 15 Mar 2023 09:56:55 +0800 Message-Id: <20230315015655.768885-3-ke1.xu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230315015655.768885-1-ke1.xu@intel.com> References: <20230315015655.768885-1-ke1.xu@intel.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org In execution config, multi-run suites and cases are grammarly allowed. When we call for a suite multiple times, the new result will overwrite the old result totally. This fix merges duplicated lines for suites when parsing the execution configuration, preventing the potential multiple run of suites and cases. Signed-off-by: Ke Xu --- framework/dts.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/framework/dts.py b/framework/dts.py index a8e670b5..b55aed90 100644 --- a/framework/dts.py +++ b/framework/dts.py @@ -149,9 +149,32 @@ def dts_parse_config(config, section): settings.save_global_setting(settings.DPDK_RXMODE_SETTING, rx_mode) settings.save_global_setting(settings.DPDK_DCFMODE_SETTING, dcf_mode) + suite_list_dedup = {} + ## suite_list_dedup[suite_name] := { True | Set | ... } + ## True := All Cases to Run + ## Set := Listed Cases to Run for suite in test_suites: if suite == "": - test_suites.remove(suite) + pass + elif ":" in suite: + suite_name = suite[: suite.find(":")] + case_list_str = suite[suite.find(":") + 1 :] + case_list = case_list_str.split("\\") + if not suite_name in suite_list_dedup: + suite_list_dedup[suite_name] = set() + if isinstance(suite_list_dedup[suite_name], set): + suite_list_dedup[suite_name].update(case_list) + elif suite_list_dedup[suite_name] == True: + pass + else: + suite_list_dedup[suite] = True + + test_suites = [] + for suite in suite_list_dedup: + if suite_list_dedup[suite] == True: + test_suites.append(suite) + elif isinstance(suite_list_dedup[suite], set) and suite_list_dedup[suite]: + test_suites.append(suite + ":" + "\\".join(suite_list_dedup[suite])) return duts, targets, test_suites