From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5DF85A00BE; Mon, 14 Mar 2022 07:12:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 244CA40DF4; Mon, 14 Mar 2022 07:12:43 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 5859F40DDD for ; Mon, 14 Mar 2022 07:12:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647238362; x=1678774362; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qAnLhRCAH6Ve7mxs/qRWIhxh3x8Igjj8uvy6EvGAME0=; b=Xt/9kkungrRC+JNRu7ud2di2myiLmHsKeQnw0fjVw+0bysmfo7HKQokQ wsV2+XEhd5dnuMK6P9HHVxLsrG5VoW4QHcyK42XppIOwJgG5H4yGbHi3s IR71sfFzE4VwuAvDELPKucu6R9wcur0lcRposXmX34MPAd5IltDpvCJ6j Y5MUDIiDpPnZwgbmoH3NEORFUbwKBQzNgmkEDHxbvzj9H3gOARKxDeqE1 VKUTHXFyGQFqakpb4R4MelAMfPNL2prFO3DtjTHWNXq/klpv+l0wL5IDD fy9C8S5dYaq0y8GD2/H6GpJycQGdWMLDT44mB0UzirPyXqEpbkt+9bc+T Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="280701687" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="280701687" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 23:12:31 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="818684051" Received: from shwdenpg197.ccr.corp.intel.com ([10.253.109.70]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 23:12:29 -0700 From: Jun Dong To: dts@dpdk.org Cc: lijuan.tu@intel.com, qingx.sun@intel.com, junx.dong@intel.com Subject: [dts] [V1] framework/dut: Modify the format of eal parameter API output Date: Mon, 14 Mar 2022 14:12:23 +0800 Message-Id: <20220314061223.1003-1-junx.dong@intel.com> X-Mailer: git-send-email 2.33.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 - Remove blank from cores list - Change validate rule of port to compatible with FreeBSD - Modify file prefix generate rule to compatible with FreeBSD Signed-off-by: Jun Dong --- framework/dut.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index 7b3535c7..4b5c34ec 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -1386,7 +1386,7 @@ class _EalParameter(object): or all(map(lambda _port: type(_port) == str, ports)) and all( map( - lambda _port: re.match(r"^([\d\w]+:){2}[\d\w]+\.[\d\w]+$", _port), + lambda _port: re.match(r"^([\d\w]+:){1,2}[\d\w]+\.[\d\w]+$", _port), ports, ) ) @@ -1446,7 +1446,7 @@ class _EalParameter(object): ) return _formated_core_list - return f'-l {", ".join(_get_consecutive_cores_range(core_list))}' + return f'-l {",".join(_get_consecutive_cores_range(core_list))}' def _make_memory_channels(self) -> str: param_template = "-n {}" @@ -1499,7 +1499,6 @@ class _EalParameter(object): if not self.fixed_prefix: fixed_file_prefix = fixed_file_prefix + "_" + self.dut.prefix_subfix fixed_file_prefix = self._do_os_handle_with_prefix_param(fixed_file_prefix) - fixed_file_prefix = "--file-prefix=" + fixed_file_prefix return fixed_file_prefix def _make_vdevs_param(self) -> str: @@ -1570,6 +1569,7 @@ class _EalParameter(object): file_prefix = "" else: self.dut.prefix_list.append(file_prefix) + file_prefix = "--file-prefix=" + file_prefix return file_prefix def make_eal_param(self) -> str: -- 2.33.1.windows.1