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 97E40A04AA; Tue, 8 Sep 2020 09:30:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8E4741C0D8; Tue, 8 Sep 2020 09:30:00 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id ED5C62BAB for ; Tue, 8 Sep 2020 09:29:58 +0200 (CEST) IronPort-SDR: CdjVCv2auQ3ZR6P8BqibYaGNsp5oTBvjqQrugVMKuZoGwxhA5do6tesYF/8O2XMp1vhTTf1Is9 fhvqcA1Cw3oA== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646621" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646621" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 00:29:58 -0700 IronPort-SDR: imi4u2qsGB87ewN2cFd+6pf01Y6xUt+RuYo1FZugPcOY9+Xfsnm4NNtq3TxRviu7nL1C+pAtsC VaaDPA+8EjVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432768" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:57 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:13 +0000 Message-Id: <20200908071825.118583-27-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908071825.118583-1-junx.w.zhou@intel.com> References: <20200908071825.118583-1-junx.w.zhou@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [dts 26/38] tests/TestSuite_vdev_primary_secondary.py: adapt to support both meson and makefile 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: Zhou jun Signed-off-by: Zhou jun --- tests/TestSuite_vdev_primary_secondary.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_vdev_primary_secondary.py b/tests/TestSuite_vdev_primary_secondary.py index 7c557ad..0919c1f 100644 --- a/tests/TestSuite_vdev_primary_secondary.py +++ b/tests/TestSuite_vdev_primary_secondary.py @@ -64,6 +64,8 @@ class TestVdevPrimarySecondary(TestCase): self.verify(len(self.coremask) >= 6, "The machine has too few cores.") self.base_dir = self.dut.base_dir.replace('~', '/root') self.pci_info = self.dut.ports_info[0]['pci'] + self.app_testpmd_path = self.dut.apps_name['test-pmd'] + self.app_symmetric_mp_path = self.dut.apps_name['symmetric_mp'] def set_up(self): """ @@ -104,7 +106,7 @@ class TestVdevPrimarySecondary(TestCase): """ launch testpmd """ - testcmd = self.dut.target + "/app/testpmd " + testcmd = self.app_testpmd_path + " " vdev1 = " --vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d,client=1'" % (self.base_dir, self.queues) vdev2 = " --vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d,client=1'" % (self.base_dir, self.queues) eal_params = self.dut.create_eal_parameters(cores="1S/12C/1T", prefix='vhost', ports=[self.pci_info]) @@ -116,8 +118,8 @@ class TestVdevPrimarySecondary(TestCase): def launch_examples(self): - example_cmd_auto = "./examples/multi_process/symmetric_mp/build/symmetric_mp -l 0 -n %d --proc-type=auto -- -p 3 --num-procs=%d --proc-id=0" - example_cmd_secondary = "./examples/multi_process/symmetric_mp/build/symmetric_mp -l 1 -n %d --proc-type=secondary -- -p 3 --num-procs=%d --proc-id=1" + example_cmd_auto = self.app_symmetric_mp_path + " -l 0 -n %d --proc-type=auto -- -p 3 --num-procs=%d --proc-id=0" + example_cmd_secondary = self.app_symmetric_mp_path + " -l 1 -n %d --proc-type=secondary -- -p 3 --num-procs=%d --proc-id=1" final_cmd_first = example_cmd_auto % (self.mem_channels, self.queues) final_cmd_secondary = example_cmd_secondary % (self.mem_channels, self.queues) self.vhost_first.send_expect(final_cmd_first, "Lcore", 120) -- 1.8.3.1