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 C5F17A0526; Mon, 20 Jan 2020 09:55:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7BC9343C; Mon, 20 Jan 2020 09:55:03 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 90181FFA for ; Mon, 20 Jan 2020 09:54:59 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jan 2020 00:54:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,341,1574150400"; d="scan'208";a="258633599" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by fmsmga002.fm.intel.com with ESMTP; 20 Jan 2020 00:54:57 -0800 From: "huang,zhimin" To: dts@dpdk.org Cc: "huang,zhimin" Date: Mon, 20 Jan 2020 17:00:16 +0800 Message-Id: <1579510828-133042-2-git-send-email-zhiminx.huang@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1579510828-133042-1-git-send-email-zhiminx.huang@intel.com> References: <1579510828-133042-1-git-send-email-zhiminx.huang@intel.com> Subject: [dts] [PATCH V1 02/14] tests/unit_tests_dump:addcreate_eal_parameters function 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" Signed-off-by: huang,zhimin --- tests/TestSuite_unit_tests_dump.py | 39 +++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py index 7772223..57dfc3a 100644 --- a/tests/TestSuite_unit_tests_dump.py +++ b/tests/TestSuite_unit_tests_dump.py @@ -55,14 +55,14 @@ class TestUnitTestsDump(TestCase): # Test cases. # + def set_up_all(self): """ Run at the start of each test suite. Nothing to do here. """ # Based on h/w type, choose how many ports to use - cores = self.dut.get_core_list("all") - self.coremask = utils.create_mask(cores) + self.cores = self.dut.get_core_list("all") self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing") self.start_test_time = 60 @@ -79,7 +79,8 @@ class TestUnitTestsDump(TestCase): """ Run history log dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target, eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_log_history", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") self.verify("EAL" in out, "Test failed") @@ -88,7 +89,8 @@ class TestUnitTestsDump(TestCase): """ Run history log dump test case. """ - cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target + eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') + cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_ring", "testpmd>", self.run_cmd_time) @@ -110,7 +112,8 @@ class TestUnitTestsDump(TestCase): """ Run mempool dump test case. """ - cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target + eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') + cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_mempool", "testpmd>", self.run_cmd_time * 2) @@ -131,7 +134,8 @@ class TestUnitTestsDump(TestCase): """ Run physical memory dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") elements = ['Segment', 'IOVA', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank'] @@ -151,7 +155,8 @@ class TestUnitTestsDump(TestCase): """ Run memzone dump test case. """ - cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target + eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') + cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2) @@ -174,7 +179,8 @@ class TestUnitTestsDump(TestCase): """ Run struct size dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_struct_sizes", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") @@ -194,15 +200,15 @@ class TestUnitTestsDump(TestCase): """ test_port = self.dut_ports[0] pci_address = self.dut.ports_info[test_port]['pci']; - self.dut.send_expect("./%s/app/test -n 1 -c %s -b %s" - % (self.target, self.coremask, pci_address), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores,b_ports=[pci_address]) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") black_str = " %s" % pci_address self.verify(black_str in out, "Dump black list failed") - self.dut.send_expect("./%s/app/test -n 1 -c %s -w %s" - % (self.target, self.coremask, pci_address), "R.*T.*E.*>.*>", self.start_test_time) + eal_params1 = self.dut.create_eal_parameters(cores=self.cores,ports=[pci_address]) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params1), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") @@ -213,7 +219,8 @@ class TestUnitTestsDump(TestCase): """ Run dump malloc dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_malloc_stats", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") match_regex = "Heap id:(\d*)" @@ -228,7 +235,8 @@ class TestUnitTestsDump(TestCase): """ Run malloc heaps dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_malloc_heaps", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") @@ -247,7 +255,8 @@ class TestUnitTestsDump(TestCase): """ Run log types dump test case. """ - self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time) + eal_params = self.dut.create_eal_parameters(cores=self.cores) + self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time) out = self.dut.send_expect("dump_log_types", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") -- 1.8.3.1