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 0824FA04AA; Tue, 8 Sep 2020 09:29:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00A701B9B7; Tue, 8 Sep 2020 09:29:56 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 8C2D31B9B7 for ; Tue, 8 Sep 2020 09:29:53 +0200 (CEST) IronPort-SDR: nYDXM7/Y9JMyWaNaL2qaSPza59QST2MOFsLCAFRlOJqaJQ35eMuL9Ty9QslUJw0Yxb81Vib+DC UooDZzdLAwbw== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646610" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646610" 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:53 -0700 IronPort-SDR: xHq8cRXk4HEyJcCb+XT/PqAA88dzGwu9kJoaZFZ8koG/3ZzLOc5Y9vRKUBMb+ZYTHscYhx/wew JcKjgKVlyCzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432745" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:52 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:09 +0000 Message-Id: <20200908071825.118583-23-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 22/38] tests/TestSuite_short_live.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_short_live.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_short_live.py b/tests/TestSuite_short_live.py index 5a91420..60a3d2e 100644 --- a/tests/TestSuite_short_live.py +++ b/tests/TestSuite_short_live.py @@ -64,6 +64,9 @@ class TestShortLiveApp(TestCase): """ self.ports = self.dut.get_ports(self.nic) self.verify(len(self.ports) >= 2, "Insufficient number of ports.") + self.app_l2fwd_path = self.dut.apps_name['l2fwd'] + self.app_l3fwd_path = self.dut.apps_name['l3fwd'] + self.app_testpmd = self.dut.apps_name['test-pmd'] def set_up(self): """ @@ -138,7 +141,7 @@ class TestShortLiveApp(TestCase): Basic rx/tx forwarding test """ #dpdk start - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 -- -i --portmask=0x3" % self.target, "testpmd>", 120) + self.dut.send_expect("./%s -c 0xf -n 4 -- -i --portmask=0x3" % self.app_testpmd, "testpmd>", 120) time.sleep(5) self.dut.send_expect("set fwd mac", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") @@ -170,7 +173,7 @@ class TestShortLiveApp(TestCase): for i in range(repeat_time): #dpdk start print("clean_up_with_signal_testpmd round %d" % (i + 1)) - self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 -- -i --portmask=0x3" % self.target, "testpmd>", 120) + self.dut.send_expect("./%s -c 0xf -n 4 -- -i --portmask=0x3" % self.app_testpmd, "testpmd>", 120) self.dut.send_expect("set fwd mac", "testpmd>") self.dut.send_expect("set promisc all off", "testpmd>") self.dut.send_expect("start", "testpmd>") @@ -195,7 +198,7 @@ class TestShortLiveApp(TestCase): for i in range(repeat_time): #dpdk start print("clean_up_with_signal_l2fwd round %d" % (i + 1)) - self.dut.send_expect("./examples/l2fwd/build/l2fwd -n 4 -c 0xf -- -p 0x3 &", "L2FWD: entering main loop", 60) + self.dut.send_expect("%s -n 4 -c 0xf -- -p 0x3 &" % self.app_l2fwd_path, "L2FWD: entering main loop", 60) self.check_forwarding([0, 1], self.nic) # kill with different Signal @@ -211,7 +214,7 @@ class TestShortLiveApp(TestCase): for i in range(repeat_time): #dpdk start print("clean_up_with_signal_l3fwd round %d" % (i + 1)) - self.dut.send_expect("./examples/l3fwd/build/l3fwd -n 4 -c 0xf -- -p 0x3 --config='(0,0,1),(1,0,2)' &", "L3FWD: entering main loop", 120) + self.dut.send_expect("%s -n 4 -c 0xf -- -p 0x3 --config='(0,0,1),(1,0,2)' &" % self.app_l3fwd_path, "L3FWD: entering main loop", 120) self.check_forwarding([0, 0], self.nic) # kill with different Signal -- 1.8.3.1