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 29E58A04AA; Tue, 8 Sep 2020 09:29:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 228BD1C0BE; Tue, 8 Sep 2020 09:29:39 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D0F772BAB for ; Tue, 8 Sep 2020 09:29:37 +0200 (CEST) IronPort-SDR: 7jGao2N/dKJE9+1P2Z1fuBBe6agfkmuR9ZKi5I3bNmpd4dLG2JzcKUx5SeVirl1yX3xXIKYvVy Ps/n/ycsr8mg== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646570" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646570" 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:37 -0700 IronPort-SDR: VHRm+flq02c/70yQyXuTaauZfVlBurGNHsgNqF425R1UPL8/ksoFCHuJZXP0ErXOeAnVIbDv64 YAP5JdQ/Gj3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432662" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:35 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:17:58 +0000 Message-Id: <20200908071825.118583-12-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 11/38] tests/TestSuite_ipfrag.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_ipfrag.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_ipfrag.py b/tests/TestSuite_ipfrag.py index 8ad2e82..4efc7a2 100644 --- a/tests/TestSuite_ipfrag.py +++ b/tests/TestSuite_ipfrag.py @@ -103,8 +103,8 @@ class TestIpfrag(TestCase): pat = re.compile("P([0123])") # Prepare long prefix match table, replace P(x) port pattern - lpmStr_ipv4 = "static struct l3fwd_ipv4_route \ -l3fwd_ipv4_route_array[] = {\\\n" + lpmStr_ipv4 = "static struct l3fwd_ipv4_route " \ + "l3fwd_ipv4_route_array[] = {\\\n" rtLpmTbl = list(lpm_table_ipv4) for idx in range(len(rtLpmTbl)): rtLpmTbl[idx] = pat.sub(self.portRepl, rtLpmTbl[idx]) @@ -134,8 +134,10 @@ l3fwd_ipv4_route_array[] = {\\\n" eal_param += " -w %s" % self.dut.ports_info[i]['pci'] # run ipv4_frag - self.dut.send_expect("examples/ip_fragmentation/build/ip_fragmentation -c %s -n %d %s -- -p %s -q %s" % ( - coremask, self.dut.get_memory_channels(), eal_param, portmask, int(numPortThread)), "Link Up", 120) + self.app_ip_fragmentation_path = self.dut.apps_name['ip_fragmentation'] + self.dut.send_expect("%s -c %s -n %d %s -- -p %s -q %s" % (self.app_ip_fragmentation_path, coremask, + self.dut.get_memory_channels(), eal_param, portmask, + int(numPortThread)), "Link Up", 120) time.sleep(2) self.txItf = self.tester.get_interface(self.tester.get_local_port(P0)) @@ -310,8 +312,9 @@ l3fwd_ipv4_route_array[] = {\\\n" eal_param += " -w %s" % self.dut.ports_info[i]['pci'] self.dut.send_expect("^c", "# ", 120) - self.dut.send_expect("examples/ip_fragmentation/build/ip_fragmentation -c %s -n %d %s -- -p %s -q %s" % ( - core_mask, self.dut.get_memory_channels(), eal_param, portmask, num_pthreads), "IP_FRAG:", 120) + self.dut.send_expect("%s -c %s -n %d %s -- -p %s -q %s" % (self.app_ip_fragmentation_path, core_mask, + self.dut.get_memory_channels(), eal_param, portmask, + num_pthreads), "IP_FRAG:", 120) result = [2, lcore, num_pthreads] for size in size_list: -- 1.8.3.1