From patchwork Fri Sep 4 08:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76520 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 44E6FA04C5; Fri, 4 Sep 2020 10:17:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D4341C0D7; Fri, 4 Sep 2020 10:17:39 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 40CE2255 for ; Fri, 4 Sep 2020 10:17:37 +0200 (CEST) IronPort-SDR: fj5O26JhnNaWAIRM1Z2cl3US6aG9IdmQEvOjrmEMou/3aeoysEM99W1pRX5WUajPVKuRjV1pOx YgzgsV+iwxfA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763309" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763309" 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:36 -0700 IronPort-SDR: uwEwz/h9iS377QVEPIO9DIzM81I5sv4uXPrhI8gp8rRXiAtv8QfinCuOTnGBXDD7OzG4krYlWv ahSbrcaQ5+xQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782719" 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:35 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:31 +0800 Message-Id: <1599207525-22123-24-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 24/38] tests/TestSuite_pvp_diff_qemu_version.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_diff_qemu_version.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py index 91b7bd3..54f148f 100644 --- a/tests/TestSuite_pvp_diff_qemu_version.py +++ b/tests/TestSuite_pvp_diff_qemu_version.py @@ -82,6 +82,8 @@ class TestVhostPVPDiffQemuVersion(TestCase): self.base_dir = self.dut.base_dir.replace('~', '/root') 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): """ @@ -89,7 +91,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ self.vhost = self.dut.new_session(suite="vhost-user") self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") self.dut.send_expect("killall -I qemu-system-x86_64", '#', 20) def packet_params_set(self): @@ -201,11 +203,10 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ Launch the vhost testpmd """ - testcmd = self.dut.target + "/app/testpmd " vdev = [r"'eth_vhost0,iface=%s/vhost-net,queues=1'" % self.base_dir] eal_params = self.dut.create_eal_parameters(cores=self.cores, 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> ", 30) self.vhost.send_expect("set fwd mac", "testpmd> ", 30) self.vhost.send_expect("start", "testpmd> ", 30) @@ -215,7 +216,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): Start testpmd in vm """ if self.vm_dut is not None: - vm_testpmd = self.dut.target + "/app/testpmd -c 0x3 -n 3" \ + vm_testpmd = self.path + " -c 0x3 -n 3" \ + " -- -i --nb-cores=1 --txd=1024 --rxd=1024" self.vm_dut.send_expect(vm_testpmd, "testpmd> ", 20) self.vm_dut.send_expect("set fwd mac", "testpmd> ", 20) @@ -314,7 +315,7 @@ class TestVhostPVPDiffQemuVersion(TestCase): """ self.dut.close_session(self.vhost) self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") - self.dut.send_expect("killall -s INT testpmd", "#") + self.dut.send_expect("killall -s INT %s" % self.testpmd_name , "#") time.sleep(2) def tear_down_all(self):