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 EBFB4A04D9; Thu, 3 Sep 2020 10:30:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DD7E11C0BC; Thu, 3 Sep 2020 10:30:31 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 52735E07 for ; Thu, 3 Sep 2020 10:30:30 +0200 (CEST) IronPort-SDR: uIcfNQNPOysjA03hYeO4NYeaP9SYfbToEJnZFxJh6rzh6wY05WHJHMr924Nz4CHa54lSfjQXlB pTMTV0XHLzTQ== X-IronPort-AV: E=McAfee;i="6000,8403,9732"; a="221753253" X-IronPort-AV: E=Sophos;i="5.76,386,1592895600"; d="scan'208";a="221753253" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2020 01:30:30 -0700 IronPort-SDR: rIfDzDPkVcWebtY/JZjFh0kvuo8mvsxAkT/wEKQla0tGgXCLXloHyJkOOL++sLcZilz9kJGE7Y 2FzZPFrnZwAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,385,1592895600"; d="scan'208";a="315404167" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 03 Sep 2020 01:30:28 -0700 From: Chen Linglix To: dts@dpdk.org Cc: Chen Linglix Date: Thu, 3 Sep 2020 16:28:27 +0800 Message-Id: <20200903082839.30213-4-linglix.chen@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903082839.30213-1-linglix.chen@intel.com> References: <20200903082839.30213-1-linglix.chen@intel.com> Subject: [dts] [dts 03/15] tests/TestSuite_unit_tests_dump:update to support meson build 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: Chen Linglix --- tests/TestSuite_unit_tests_dump.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py index 57dfc3a..603cc1a 100644 --- a/tests/TestSuite_unit_tests_dump.py +++ b/tests/TestSuite_unit_tests_dump.py @@ -80,7 +80,8 @@ class TestUnitTestsDump(TestCase): Run history log dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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") @@ -90,7 +91,7 @@ class TestUnitTestsDump(TestCase): Run history log dump test case. """ eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') - cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) + cmd = self.dut.apps_name['test-pmd'] + eal_params + '-- -i' self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_ring", "testpmd>", self.run_cmd_time) @@ -113,7 +114,7 @@ class TestUnitTestsDump(TestCase): Run mempool dump test case. """ eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') - cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) + cmd = self.dut.apps_name['test-pmd'] + eal_params + '-- -i' self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_mempool", "testpmd>", self.run_cmd_time * 2) @@ -135,7 +136,8 @@ class TestUnitTestsDump(TestCase): Run physical memory dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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'] @@ -156,7 +158,7 @@ class TestUnitTestsDump(TestCase): Run memzone dump test case. """ eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T') - cmd = "./%s/app/testpmd %s -- -i" % (self.target,eal_params) + cmd = self.dut.apps_name['test-pmd'] + eal_params + '-- -i' self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2) @@ -180,7 +182,8 @@ class TestUnitTestsDump(TestCase): Run struct size dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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", "# ") @@ -201,14 +204,16 @@ class TestUnitTestsDump(TestCase): test_port = self.dut_ports[0] pci_address = self.dut.ports_info[test_port]['pci']; 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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") 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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", "# ") @@ -220,7 +225,8 @@ class TestUnitTestsDump(TestCase): Run dump malloc dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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*)" @@ -236,7 +242,8 @@ class TestUnitTestsDump(TestCase): Run malloc heaps dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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", "# ") @@ -256,7 +263,8 @@ class TestUnitTestsDump(TestCase): Run log types dump test case. """ 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) + app_name = self.dut.apps_name['test'] + self.dut.send_expect(app_name + 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