From patchwork Tue Sep 8 07:18:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhou, JunX W" X-Patchwork-Id: 76854 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F7C2A04AA; Tue, 8 Sep 2020 09:29:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 78A971C0CF; Tue, 8 Sep 2020 09:29:51 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 991322BAB for ; Tue, 8 Sep 2020 09:29:49 +0200 (CEST) IronPort-SDR: p9tiLXXhkwU6Vrp4H8eK9+CHH4o/VCRhqrBo2WmzJhAXdB5V2VS5VlytqI1KUaFkgBrMTSKG+s lHLYrA1ETx/A== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646597" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646597" 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:49 -0700 IronPort-SDR: T/YrLhMr2xfQu0I0B0aSs1GvgYuVHGMb8VWQeILJsQjIgTllvPl26oJK+VQEVBui+oSGgU4hdf SQTI9psqi06g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432726" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:48 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:06 +0000 Message-Id: <20200908071825.118583-20-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 Subject: [dts] [dts 19/38] tests/TestSuite_multicast.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_multicast.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_multicast.py b/tests/TestSuite_multicast.py index bab1b1e..a74e48d 100644 --- a/tests/TestSuite_multicast.py +++ b/tests/TestSuite_multicast.py @@ -83,7 +83,8 @@ class TestMulticast(TestCase): self.dut.send_expect(r"sed -i '/mcast_group_table\[\].*{/,/^\}\;/c\\%s' examples/ipv4_multicast/main.c" % repStr, "# ") # make application - out = self.dut.send_expect("make -C examples/ipv4_multicast", "#") + out = self.dut.build_dpdk_apps('examples/ipv4_multicast') + self.app_ipv4_multicast_path = self.dut.apps_name['ipv4_multicast'] self.verify("Error" not in out, "compilation error 1") self.verify("No such file" not in out, "compilation error 2") @@ -100,8 +101,8 @@ class TestMulticast(TestCase): cores = self.dut.get_core_list("1S/2C/1T") coremask = utils.create_mask(cores) payload = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - self.dut.send_expect("examples/ipv4_multicast/build/ipv4_multicast -c %s -n 4 -- -p %s -q 2" % ( - coremask, '0x5'), "IPv4_MULTICAST:", 60) + self.dut.send_expect("%s -c %s -n 4 -- -p %s -q 2" % (self.app_ipv4_multicast_path, + coremask, '0x5'), "IPv4_MULTICAST:", 60) for flow in list(trafficFlow.keys()): for tx_port in trafficFlow[flow][0].split(","):