From patchwork Tue Sep 8 07:17:49 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: 76837 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 98A80A04B1; Tue, 8 Sep 2020 09:29:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 725CB1BF8A; Tue, 8 Sep 2020 09:29:20 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 66ED82BAB for ; Tue, 8 Sep 2020 09:29:19 +0200 (CEST) IronPort-SDR: v0DaQ0nsGVe+I23C5tHNoJT7X6A4LjpftB534Vpfy6WRu/gUtqVklQYRckMKwhN76BpLNWB9BF RDnT73TqswLg== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646527" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646527" 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:19 -0700 IronPort-SDR: 1QtAwrD1R265oIwQb7vKWfNPDwlwZnwGIqiWunNDmXkYYWFsLH+hjzdrqOybHFZNU1P8teYGim Xl8LCJR1khTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432576" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:17 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:17:49 +0000 Message-Id: <20200908071825.118583-3-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 02/38] tests/TestSuite_coremask.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_coremask.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py index 7299e0c..4e6cd02 100644 --- a/tests/TestSuite_coremask.py +++ b/tests/TestSuite_coremask.py @@ -17,7 +17,7 @@ from test_case import TestCase # Test class. # -command_line = """./%s/app/test -c %s -n %d --log-level="lib.eal,8" """ +command_line = """./%s -c %s -n %d --log-level="lib.eal,8" """ class TestCoremask(TestCase): @@ -37,7 +37,7 @@ class TestCoremask(TestCase): self.port_mask = utils.create_mask(self.dut.get_ports(self.nic)) self.mem_channel = self.dut.get_memory_channels() - + self.app_test_path = self.dut.apps_name['test'] self.all_cores = self.dut.get_core_list("all") def set_up(self): @@ -71,7 +71,7 @@ class TestCoremask(TestCase): core_mask = utils.create_mask([core]) - command = command_line % (self.target, core_mask, + command = command_line % (self.app_test_path, core_mask, self.mem_channel) out = self.dut.send_expect(command, "RTE>>", 10) @@ -94,7 +94,7 @@ class TestCoremask(TestCase): first_core=self.all_cores[0] - command = command_line % (self.target, core_mask, self.mem_channel) + command = command_line % (self.app_test_path, core_mask, self.mem_channel) out = self.dut.send_expect(command, "RTE>>", 10) self.verify("EAL: Master lcore %s is ready" % first_core in out, @@ -116,16 +116,14 @@ class TestCoremask(TestCase): """ Check coremask parsing for more cores than available. """ - - command_line = """./%s/app/test -c %s -n %d --log-level="lib.eal,8" 2>&1 |tee out""" + command_line = """./%s -c %s -n %d --log-level="lib.eal,8" 2>&1 |tee out""" # Create a extremely big coremask big_coremask_size = self.get_available_max_lcore() big_coremask = "0x" for _ in range(0, big_coremask_size, 4): big_coremask += "f" - - command = command_line % (self.target, big_coremask, self.mem_channel) + command = command_line % (self.app_test_path, big_coremask, self.mem_channel) try: out = self.dut.send_expect(command, "RTE>>", 10) except: @@ -156,7 +154,7 @@ class TestCoremask(TestCase): for coremask in wrong_coremasks: - command = command_line % (self.target, coremask, self.mem_channel) + command = command_line % (self.app_test_path, coremask, self.mem_channel) try: out = self.dut.send_expect(command, "# ", 5) self.verify("EAL: invalid coremask" in out,