From patchwork Tue Sep 8 07:18:01 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: 76849 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 AFAB6A04AA; Tue, 8 Sep 2020 09:29:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A73ED1C0D4; Tue, 8 Sep 2020 09:29:44 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 128C72BAB for ; Tue, 8 Sep 2020 09:29:42 +0200 (CEST) IronPort-SDR: u3AW8NvjHcFpMI6ZFxLSaaeHhp5OowfV9nAothLYLug8gLpdMjRPktrCQQ2AeNhNgSOyT7L2VR mtIkrAIQNKGg== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646585" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646585" 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:42 -0700 IronPort-SDR: KFMIWCdsbRYgkEy10Yn1g70yQCVRPiQRAnl1+RClsQHxRktFwd4QBFn4Bg9P2mgya2lgRdmo1y kQzMrzklzV6g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432690" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:41 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:01 +0000 Message-Id: <20200908071825.118583-15-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 14/38] tests/TestSuite_kni.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_kni.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index 8f95e75..f2d3ef9 100644 --- a/tests/TestSuite_kni.py +++ b/tests/TestSuite_kni.py @@ -263,7 +263,8 @@ class TestKni(TestCase): self.dut.send_expect("sed -i -e 's/CONFIG_RTE_KNI_KMOD=n$/CONFIG_RTE_KNI_KMOD=y/' config/common_base", "# ", 30) self.dut.build_install_dpdk(self.target) - out = self.dut.build_dpdk_apps("./examples/kni/") + out = self.dut.build_dpdk_apps("./examples/kni") + self.app_kni_path = self.dut.apps_name['kni'] self.verify('Error' not in out, "Compilation failed") p0_pci = self.dut.ports_info[0]['pci'] numa_node = int(self.dut.send_expect("cat /sys/bus/pci/devices/%s/numa_node"%p0_pci, "# ", 30)) @@ -341,8 +342,8 @@ class TestKni(TestCase): config_param = self.build_config_param() out_kni = self.dut.send_expect( - './examples/kni/build/kni -c %s -n %d -- -P -p %s %s -m &' % - (core_mask, self.dut.get_memory_channels(), port_mask, config_param), + './%s -c %s -n %d -- -P -p %s %s -m &' % + (self.app_kni_path, core_mask, self.dut.get_memory_channels(), port_mask, config_param), "Link Up", 20) time.sleep(5)