From patchwork Tue Sep 8 07:17:50 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: 76838 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 A6C30A04AA; Tue, 8 Sep 2020 09:29:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9E2211BF7E; Tue, 8 Sep 2020 09:29:22 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 61F372BAB for ; Tue, 8 Sep 2020 09:29:21 +0200 (CEST) IronPort-SDR: cUnCAOMmKmE0zTiT/DJ5+UgpPdGzjSp2lVo7rhvMazkpr6wGFV39FBsmzX83Addy0AcDuvfE5l 6vJO32x6r7ZQ== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646532" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646532" 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:21 -0700 IronPort-SDR: eBuhMAtHtzDPPqlRo+YQC0qS0r/VCXRgNtoAgQk+EaEDnLrBb3plD9ot+XmKW4Gb4SxhIYibef 4IWY+AqnMFxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432582" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:19 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:17:50 +0000 Message-Id: <20200908071825.118583-4-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 03/38] tests/TestSuite_distributor.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_distributor.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_distributor.py b/tests/TestSuite_distributor.py index 9ccc761..e5a8454 100644 --- a/tests/TestSuite_distributor.py +++ b/tests/TestSuite_distributor.py @@ -54,7 +54,8 @@ class TestDistributor(TestCase): self.verify("No such" not in out, "Compilation error") self.dut_ports = self.dut.get_ports() - self.app = "./examples/distributor/build/distributor_app" + self.app_distributor_path = self.dut.apps_name['distributor'] + self.app_test_path = self.dut.apps_name['test'] # get dts output path if self.logger.log_path.startswith(os.sep): self.output_path = self.logger.log_path @@ -75,7 +76,7 @@ class TestDistributor(TestCase): """ Run distributor unit test """ - self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "RTE>>", 60) + self.dut.send_expect("./%s -n 1 -c f" % self.app_test_path, "RTE>>", 60) out = self.dut.send_expect("distributor_autotest", "RTE>>", 30) self.dut.send_expect("quit", "# ") self.verify("Test OK" in out, "Test failed") @@ -84,7 +85,7 @@ class TestDistributor(TestCase): """ Run distributor unit perf test """ - self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "RTE>>", 60) + self.dut.send_expect("./%s -n 1 -c f" % self.app_test_path, "RTE>>", 60) out = self.dut.send_expect("distributor_perf_autotest", "RTE>>", 120) cycles_single = self.strip_cycles(out, "single") cycles_burst = self.strip_cycles(out, "burst") @@ -132,7 +133,7 @@ class TestDistributor(TestCase): if len(cores) < (worker_num + 4): cores = self._get_thread_lcore(worker_num + 4) - cmd = cmd_fmt % (self.app, utils.create_mask(cores), + cmd = cmd_fmt % (self.app_distributor_path, utils.create_mask(cores), self.dut.get_memory_channels(), self.dut.get_port_pci(self.dut_ports[0])) @@ -172,7 +173,7 @@ class TestDistributor(TestCase): max_workers = int(m.group(1)) cores = self._get_thread_lcore(max_workers - 1 + 4) - cmd = cmd_fmt % (self.app, utils.create_mask(cores), + cmd = cmd_fmt % (self.app_distributor_path, utils.create_mask(cores), self.dut.get_memory_channels(), self.dut.get_port_pci(self.dut_ports[0])) @@ -193,7 +194,7 @@ class TestDistributor(TestCase): socket = self.dut.get_numa_id(self.dut_ports[0]) cores = self.dut.get_core_list("1S/%dC/1T" % (2 + 4), socket) - cmd = cmd_fmt % (self.app, utils.create_mask(cores), + cmd = cmd_fmt % (self.app_distributor_path, utils.create_mask(cores), self.dut.get_memory_channels(), self.dut.get_port_pci(self.dut_ports[0]), self.dut.get_port_pci(self.dut_ports[1]))