From patchwork Tue Sep 8 07:18:24 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: 76872 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 D4F35A04B1; Tue, 8 Sep 2020 09:30:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CE1911C139; Tue, 8 Sep 2020 09:30:15 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id A758A1C134 for ; Tue, 8 Sep 2020 09:30:13 +0200 (CEST) IronPort-SDR: XucW8lz1lU51DVWsVgRKlmMs83FpKCXDEeSZH/2Mvjq/lAnQbvWqmW7N3Lds2IyAStLcXc69GV uCc4wfQQr07A== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646674" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646674" 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:30:13 -0700 IronPort-SDR: uFvc8czxxRyQpg5lZW+mfesNbS+RWZaficjkXnFEoLEnnDPXiIdJ2gJrq7r3jpXX40YqSLHS1i BFESZs7/KnHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432933" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:30:12 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:24 +0000 Message-Id: <20200908071825.118583-38-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 37/38] tests/TestSuite_vmdq.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_vmdq.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py index 162636f..8e721e5 100644 --- a/tests/TestSuite_vmdq.py +++ b/tests/TestSuite_vmdq.py @@ -31,9 +31,11 @@ class TestVmdq(TestCase): self.dut.build_install_dpdk(self.target) # Update the max queue per port for Fortville. self.dut.send_expect("sed -i 's/define MAX_QUEUES 128/define MAX_QUEUES 1024/' ./examples/vmdq/main.c", "#", 5) - out = self.dut.send_expect("make -C examples/vmdq", "#", 10) + # out = self.dut.send_expect("make -C examples/vmdq", "#", 10) + out = self.dut.build_dpdk_apps('examples/vmdq') self.verify("Error" not in out, "Compilation error") + self.app_vmdq_path = self.dut.apps_name['vmdq'] self.frame_size = 64 self.header_size = HEADER_SIZE['ip'] + HEADER_SIZE['eth'] self.destmac_port = ["52:54:00:12:0%d:00" % i for i in self.dut_ports] @@ -86,8 +88,8 @@ class TestVmdq(TestCase): for i in self.dut_ports: eal_param += " -w %s" % self.dut.ports_info[i]['pci'] # Run the application - self.dut.send_expect("./examples/vmdq/build/vmdq_app -c %s -n 4 %s -- -p %s --nb-pools %s --enable-rss" % - (core_mask, eal_param, port_mask, str(npools)), "reading queues", 120) + self.dut.send_expect("./%s -c %s -n 4 %s -- -p %s --nb-pools %s --enable-rss" % + (self.app_vmdq_path, core_mask, eal_param, port_mask, str(npools)), "reading queues", 120) def get_tgen_input(self, prios): """