From patchwork Fri Sep 4 08:18:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76524 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0F7AEA04C5; Fri, 4 Sep 2020 10:17:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E10B21C128; Fri, 4 Sep 2020 10:17:44 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id BE7821C11F for ; Fri, 4 Sep 2020 10:17:42 +0200 (CEST) IronPort-SDR: auk1bCvV0ZXPUe4QXKo2XvIX+CAwYhbwwhA9ZyUNDREdsT/HGily8y9ancKjOz9g+X5hOnKWKU SoIXY+atByzQ== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763318" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763318" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:42 -0700 IronPort-SDR: 2I2fQFLJFTg6nyMFP1n2VbBGE3S9feK23urQe3UYcWu0BYVkmR6MYJqOvVABqSQCMU0h4Ya8U3 +YzXER97Lwzg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782760" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.150]) by orsmga002.jf.intel.com with ESMTP; 04 Sep 2020 01:17:41 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:35 +0800 Message-Id: <1599207525-22123-28-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> References: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> Subject: [dts] [dts 28/38] tests/TestSuite_pvp_qemu_multi_paths_port_restart.py: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: xizhan4x --- tests/TestSuite_pvp_qemu_multi_paths_port_restart.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py index 877d40b..1c31ce6 100644 --- a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py +++ b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py @@ -73,6 +73,8 @@ class TestPVPQemuMultiPathPortRestart(TestCase): self.pktgen_helper = PacketGeneratorHelper() self.pci_info = self.dut.ports_info[0]['pci'] self.number_of_ports = 1 + self.path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.path.split("/")[-1] def set_up(self): """ @@ -80,7 +82,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ # Clean the execution ENV self.dut.send_expect("rm -rf ./vhost.out", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") # Prepare the result table self.table_header = ["FrameSize(B)", "Mode", @@ -93,13 +95,12 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ start testpmd on vhost """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("rm -rf ./vhost-net*", "#") - testcmd = self.dut.target + "/app/testpmd " vdev = [r"'net_vhost0,iface=vhost-net,queues=1'"] eal_params = self.dut.create_eal_parameters(cores=self.core_list, prefix='vhost', ports=[self.pci_info], vdevs=vdev) para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024" - command_line_client = testcmd + eal_params + para + command_line_client = self.path + eal_params + para self.vhost.send_expect(command_line_client, "testpmd> ", 120) self.vhost.send_expect("set fwd mac", "testpmd> ", 120) self.vhost.send_expect("start", "testpmd> ", 120) @@ -109,16 +110,16 @@ class TestPVPQemuMultiPathPortRestart(TestCase): start testpmd in vm depend on different path """ if path == "mergeable": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--nb-cores=1 --txd=1024 --rxd=1024" elif path == "normal": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--tx-offloads=0x0 --enable-hw-vlan-strip " + \ "--nb-cores=1 --txd=1024 --rxd=1024" elif path == "vector_rx": - command = self.dut.target + "/app/testpmd " + \ + command = self.path + \ "-c 0x3 -n 3 -- -i " + \ "--nb-cores=1 --txd=1024 --rxd=1024" self.vm_dut.send_expect(command, "testpmd> ", 30) @@ -356,7 +357,7 @@ class TestPVPQemuMultiPathPortRestart(TestCase): """ Run after each test case. """ - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") self.close_session() time.sleep(2)