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 0A208A04B7; Wed, 2 Sep 2020 11:14:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED3F31C0C2; Wed, 2 Sep 2020 11:14:22 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 955BA1C07D for ; Wed, 2 Sep 2020 11:14:20 +0200 (CEST) IronPort-SDR: HrhneqI7rae6FHmdI7EFgpezK2KE45/iWNtJuT8iD8ZtTdsv+NsDV/ZfUynEzjk1XIZylTFF8A EaAWF09keeaQ== X-IronPort-AV: E=McAfee;i="6000,8403,9731"; a="158348278" X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="158348278" 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; 02 Sep 2020 02:14:20 -0700 IronPort-SDR: L0PcqOayCG4JUCZLqdh77zqoAaaBatFcYtnhSoX7806Gpgkg4M2SW5gvLpoh0b3t5Y+Rj8kQd5 ZEC4FsHKjUVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,381,1592895600"; d="scan'208";a="405099318" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga001.fm.intel.com with ESMTP; 02 Sep 2020 02:14:18 -0700 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Wed, 2 Sep 2020 17:15:08 +0800 Message-Id: <20200902091510.6043-7-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200902091510.6043-1-weix.xie@intel.com> References: <20200902091510.6043-1-weix.xie@intel.com> Subject: [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support meson build method 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: Xie wei --- tests/TestSuite_vf_interrupt_pmd.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py index 55a8e3d..ac30950 100644 --- a/tests/TestSuite_vf_interrupt_pmd.py +++ b/tests/TestSuite_vf_interrupt_pmd.py @@ -65,8 +65,6 @@ class TestVfInterruptPmd(TestCase): self.port_mask = utils.create_mask(ports) self.core_mask_user = utils.create_mask(self.core_list[0:1]) - self.path = "./examples/l3fwd-power/build/l3fwd-power" - testport_0 = self.tester.get_local_port(self.dut_ports[0]) self.rx_intf_0 = self.tester.get_interface(testport_0) self.tester_mac = self.tester.get_mac(testport_0) @@ -94,6 +92,8 @@ class TestVfInterruptPmd(TestCase): "sed -i -e '/DEV_RX_OFFLOAD_CHECKSUM,/d' \ ./examples/l3fwd-power/main.c", "#", 10) out = use_dut.send_expect("make -C examples/l3fwd-power", "#") + out = use_dut.build_dpdk_apps("./examples/l3fwd-power") + self.path = use_dut.apps_name['l3fwd-power'] self.verify("Error" not in out, "compilation error") def send_packet(self, mac, testinterface, use_dut): @@ -127,9 +127,7 @@ class TestVfInterruptPmd(TestCase): """ begin l3fwd-power """ - cmd_vhost_net = "./examples/l3fwd-power/build/l3fwd-power -n %d -c %s" % ( - use_dut.get_memory_channels(), self.core_mask_user) + \ - " -- -P -p 1 --config='(0,0,%s)'" % self.core_user + cmd_vhost_net = self.path + "-n %d -c %s" % (use_dut.get_memory_channels(), self.core_mask_user) + " -- -P -p 1 --config='(0,0,%s)'" % self.core_user try: self.logger.info("Launch l3fwd_sample sample:") self.out = use_dut.send_expect(cmd_vhost_net, "L3FWD_POWER", 60) @@ -149,8 +147,7 @@ class TestVfInterruptPmd(TestCase): if config_info != "": config_info += ',' config_info += '(0,%d,%d)' % (queue, queue) - cmd_vhost_net = "./examples/l3fwd-power/build/l3fwd-power -l 0-%d -n 4 -- -P -p 0x1" % \ - queue + " --config='%s'" % config_info + cmd_vhost_net = self.path + "-l 0-%d -n 4 -- -P -p 0x1" % queue + " --config='%s'" % config_info try: self.logger.info("Launch l3fwd_sample sample:") self.out = use_dut.send_expect(cmd_vhost_net, "L3FWD_POWER", 60) @@ -239,10 +236,7 @@ class TestVfInterruptPmd(TestCase): core_user = core_list[0] core_mask_user = utils.create_mask(core_list) - cmd = self.path + \ - " -c %s -n %d -- -P -p 0x01 --config='(0,0,%s)'" % ( - core_mask_user, self.vm0_dut.get_memory_channels(), core_user) - + cmd = self.path + "-c %s -n %d -- -P -p 0x01 --config='(0,0,%s)'" % (core_mask_user, self.vm0_dut.get_memory_channels(), core_user) self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60) self.send_packet(self.vf0_mac, self.rx_intf_0, self.vm0_dut) self.destroy_vm_env() @@ -365,9 +359,7 @@ class TestVfInterruptPmd(TestCase): if config_info != "": config_info += ',' config_info += '(0,%d,%d)' % (queue, queue) - cmd = "./examples/l3fwd-power/build/l3fwd-power -c %s -n 4 -- -P -p 0x1" \ - % core_mask_user + \ - " --config='%s'" % config_info + cmd = self.path + "-c %s -n 4 -- -P -p 0x1" % core_mask_user + " --config='%s'" % config_info self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60) time.sleep(1) try: @@ -397,7 +389,7 @@ class TestVfInterruptPmd(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall l3fwd-power", "# ", 10, alt_session=True) + self.dut.send_expect("killall %s" % self.path.strip().split('/')[-1], "# ", 10, alt_session=True) def tear_down_all(self): """ -- 2.17.1