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 D3D29A04AA; Tue, 8 Sep 2020 09:29:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC5A11C0DA; Tue, 8 Sep 2020 09:29:45 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id A78C61C0D8 for ; Tue, 8 Sep 2020 09:29:44 +0200 (CEST) IronPort-SDR: dY1Nwz2lt8aUPPtNfovCRH2f8c1XhrjHtUkxELuV5pgT0AwM+oJ8rH5I7+rvtUg5ZFqA1NItWB DgXTP9FJ7jsg== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646588" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646588" 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:44 -0700 IronPort-SDR: G9F+sX3jvuyDl2vb/VP9KpCiWrgERZkrJsv6guFV0ZyXOxA+aQfWaL9iMNwF7aGYIvWojAjieJ oZfrHFydZGGQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432697" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:42 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:02 +0000 Message-Id: <20200908071825.118583-16-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 15/38] tests/TestSuite_l2fwd.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_l2fwd.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_l2fwd.py b/tests/TestSuite_l2fwd.py index f8c0d72..091ac09 100644 --- a/tests/TestSuite_l2fwd.py +++ b/tests/TestSuite_l2fwd.py @@ -70,6 +70,7 @@ class TestL2fwd(TestCase): # compile out = self.dut.build_dpdk_apps("./examples/l2fwd") + self.app_l2fwd_path = self.dut.apps_name['l2fwd'] self.verify("Error" not in out, "Compilation error") self.verify("No such" not in out, "Compilation error") @@ -108,7 +109,7 @@ class TestL2fwd(TestCase): port_mask = utils.create_mask([self.dut_ports[0], self.dut_ports[1]]) eal_params = self.dut.create_eal_parameters() - self.dut.send_expect("./examples/l2fwd/build/l2fwd %s -- -q 8 -p %s &" % (eal_params, port_mask), + self.dut.send_expect("./%s %s -- -q 8 -p %s &" % (self.app_l2fwd_path, eal_params, port_mask), "L2FWD: entering main loop", 60) for i in [0, 1]: @@ -144,8 +145,8 @@ class TestL2fwd(TestCase): eal_params = self.dut.create_eal_parameters(cores=cores) for queues in self.test_queues: - command_line = "./examples/l2fwd/build/l2fwd %s -- -q %s -p %s &" % \ - (eal_params, str(queues['queues']), port_mask) + command_line = "./%s %s -- -q %s -p %s &" % \ + (self.app_l2fwd_path, eal_params, str(queues['queues']), port_mask) self.dut.send_expect(command_line, "L2FWD: entering main loop", 60) @@ -196,8 +197,8 @@ class TestL2fwd(TestCase): for queues in self.test_queues: - command_line = "./examples/l2fwd/build/l2fwd %s %s -- -q %s -p %s &" % \ - (eal_params, eal_param, str(queues['queues']), port_mask) + command_line = "./%s %s %s -- -q %s -p %s &" % \ + (self.app_l2fwd_path, eal_params, eal_param, str(queues['queues']), port_mask) # self.dut.send_expect(command_line, "memory mapped", 60) self.dut.send_expect(command_line, "L2FWD: entering main loop", 60) -- 1.8.3.1