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 86766A04C9; Wed, 16 Sep 2020 14:45:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A6FE1C2ED; Wed, 16 Sep 2020 14:45:02 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id E494E1C2E7 for ; Wed, 16 Sep 2020 14:45:00 +0200 (CEST) IronPort-SDR: jzkIZXUz/L5W/J3ObiIxT2zrmw0E7I9XNA9EPeOHVef4RmoTH56yhA3Fe7jfZg+AVQULb3SNmQ jCnDHEaygf4A== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="160383163" X-IronPort-AV: E=Sophos;i="5.76,432,1592895600"; d="scan'208";a="160383163" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 05:45:00 -0700 IronPort-SDR: 9iPF/ajK1eEaLHveomDhPzILAY+sCGup33TT86cYen9CYDQCuXZStvH9LNKjVRUjOVKrpaENeK GEv968d9fhHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,432,1592895600"; d="scan'208";a="409542313" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by fmsmga001.fm.intel.com with ESMTP; 16 Sep 2020 05:44:59 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: "Zhou, Jun" , Zhou@dpdk.org Date: Wed, 16 Sep 2020 12:29:46 +0000 Message-Id: <20200916122951.17646-6-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916122951.17646-1-junx.w.zhou@intel.com> References: <20200916122951.17646-1-junx.w.zhou@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V1 05/10] tests/TestSuite_dynamic_queue.py: Instead of getting the rxq&txq value from common_base to rte_config.h X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "dts" Instead of getting the rxq&txq value from common_base to rte_config.h Signed-off-by: Zhou, Jun --- tests/TestSuite_dynamic_queue.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py index 356ebfd6..bdf226a0 100644 --- a/tests/TestSuite_dynamic_queue.py +++ b/tests/TestSuite_dynamic_queue.py @@ -17,10 +17,10 @@ class TestDynamicQueue(TestCase): def set_up_all(self): self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, "Insufficient ports") - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' - pattern = "%s=(\d*)" % self.PF_Q_strip - self.PF_QUEUE = self.element_strip(out, pattern) + out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10) + self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' + pattern = "define (%s) (\d*)" % self.PF_Q_strip + self.PF_QUEUE = self.element_strip(out, pattern, True) self.used_dut_port = self.dut_ports[0] tester_port = self.tester.get_local_port(self.used_dut_port) self.tester_intf = self.tester.get_interface(tester_port) @@ -45,7 +45,7 @@ class TestDynamicQueue(TestCase): "Default", "--port-topology=chained --txq=%s --rxq=%s" % (self.PF_QUEUE, self.PF_QUEUE)) - def element_strip(self, out, pattern): + def element_strip(self, out, pattern, if_get_from_cfg=False): """ Strip and get queue number. """ @@ -55,7 +55,7 @@ class TestDynamicQueue(TestCase): print((utils.RED('Fail to search number.'))) return None else: - result = res.group(1) + result = res.group(2) if if_get_from_cfg else res.group(1) return int(result) def send_packet(self): -- 2.25.1