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 CB209A04C8; Fri, 18 Sep 2020 10:59:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C30161D945; Fri, 18 Sep 2020 10:59:28 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id B222E1D93D for ; Fri, 18 Sep 2020 10:59:26 +0200 (CEST) IronPort-SDR: FGY7KfbQKSmjcZS5rf2o/Kl8J/gHUol6BAoOk69dkNZKna3KjNXL1CjhrrTkBDqHmVYlgp2HDk 1leAKs3ChkLg== X-IronPort-AV: E=McAfee;i="6000,8403,9747"; a="139898008" X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="139898008" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 01:59:25 -0700 IronPort-SDR: Icwjac1ih5NS8CZRHHIvNxfr7SSiRgeK0W46SdQ3rdjRlQY9mAlaZsw4WlZGD27bn/Vrpb3aP3 EwO5/fROhLYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="410228277" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga001.fm.intel.com with ESMTP; 18 Sep 2020 01:59:24 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: JiangYu Date: Fri, 18 Sep 2020 16:57:57 +0800 Message-Id: <20200918085757.24204-1-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [dst] [PATCH V1] tests/TestSuite_virtio_user_for_container_networking: 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" From: JiangYu Adapt meson build and kill testpmd_name Signed-off-by: JiangYu --- tests/TestSuite_virtio_user_for_container_networking.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_virtio_user_for_container_networking.py b/tests/TestSuite_virtio_user_for_container_networking.py index 36a7838..0fca14a 100644 --- a/tests/TestSuite_virtio_user_for_container_networking.py +++ b/tests/TestSuite_virtio_user_for_container_networking.py @@ -72,13 +72,15 @@ class TestVirtioUserForContainer(TestCase): # create an instance to set stream field setting self.pktgen_helper = PacketGeneratorHelper() self.number_of_ports = 1 + self.app_testpmd_path = self.dut.apps_name['test-pmd'] + self.testpmd_name = self.app_testpmd_path.split("/")[-1] def set_up(self): """ Run before each test case. """ self.dut.send_expect('rm -rf ./vhost-net*', '# ') - self.dut.send_expect('killall -s INT testpmd', '# ') + self.dut.send_expect('killall -s INT %s' % self.testpmd_name, '# ') self.vhost_user = self.dut.new_session(suite='vhost-user') self.virtio_user = self.dut.new_session(suite='virtio-user') # Prepare the result table @@ -158,7 +160,7 @@ class TestVirtioUserForContainer(TestCase): eal_param = self.dut.create_eal_parameters(cores=self.core_list_vhost_user, prefix='vhost', vdevs=["net_vhost0,iface=vhost-net,queues=%d,client=0" % self.queue_number],ports=[self.pci_info]) if self.check_2M_env: eal_param += " --single-file-segments" - command_line_client = self.dut.target + '/app/testpmd ' + eal_param + ' -- -i --nb-cores=%d' % self.nb_cores + command_line_client = self.app_testpmd_path + eal_param + ' -- -i --nb-cores=%d' % self.nb_cores self.vhost_user.send_expect(command_line_client, 'testpmd> ', 30) self.vhost_user.send_expect('start', 'testpmd> ', 30) @@ -169,20 +171,20 @@ class TestVirtioUserForContainer(TestCase): if self.check_2M_env: command_line_user = 'docker run -i -t --privileged -v %s/vhost-net:/tmp/vhost-net ' + \ '-v /mnt/huge:/dev/hugepages ' + \ - '-v %s:%s %s .%s/%s/app/testpmd -c %s -n %d ' + \ + '-v %s:%s %s .%s/%s -c %s -n %d ' + \ '-m 1024 --no-pci --file-prefix=container --single-file-segments ' + \ '--vdev=virtio_user0,mac=00:11:22:33:44:10,path=/tmp/vhost-net,queues=%d ' + \ '-- -i --rxq=%d --txq=%d --nb-cores=%d' else: command_line_user = 'docker run -i -t --privileged -v %s/vhost-net:/tmp/vhost-net ' + \ '-v /mnt/huge:/dev/hugepages ' + \ - '-v %s:%s %s .%s/%s/app/testpmd -c %s -n %d ' + \ + '-v %s:%s %s .%s/%s -c %s -n %d ' + \ '-m 1024 --no-pci --file-prefix=container ' + \ '--vdev=virtio_user0,mac=00:11:22:33:44:10,path=/tmp/vhost-net,queues=%d ' + \ '-- -i --rxq=%d --txq=%d --nb-cores=%d' command_line_user = command_line_user % (self.container_base_dir, self.container_base_dir, self.container_base_dir, self.docker_image, - self.container_base_dir, self.dut.target, self.core_mask_virtio_user, + self.container_base_dir, self.app_testpmd_path, self.core_mask_virtio_user, self.mem_channels, self.queue_number, self.queue_number, self.queue_number, self.nb_cores) self.virtio_user.send_expect(command_line_user, 'testpmd> ', 120) @@ -227,7 +229,7 @@ class TestVirtioUserForContainer(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, '# ') def tear_down_all(self): """ -- 2.7.4