From patchwork Tue Sep 8 07:18:03 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: 76851 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 0CE5BA04AA; Tue, 8 Sep 2020 09:29:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02AE31C0D1; Tue, 8 Sep 2020 09:29:47 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id AFE7A1C0D0 for ; Tue, 8 Sep 2020 09:29:45 +0200 (CEST) IronPort-SDR: L/7IweR6bqg5MLtenDxl+x38i/mYynGd2Cno9fSjfjyyt2P2kLXUvDNyr+1gOeY4aUg9xtjZ2Y 4hiomb0bY33g== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646590" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646590" 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:45 -0700 IronPort-SDR: iInbkTOg0CzCb+/9Oft9FDKQmiSvvs3uulveBJ+Mdw+TeekryNmTYIN8kFUig8w/4/1YHjAuPn ikR7f4YG1+ig== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432704" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:29:44 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:03 +0000 Message-Id: <20200908071825.118583-17-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 16/38] tests/TestSuite_l3fwdacl.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_l3fwdacl.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/TestSuite_l3fwdacl.py b/tests/TestSuite_l3fwdacl.py index 1ab72a6..35b7c25 100644 --- a/tests/TestSuite_l3fwdacl.py +++ b/tests/TestSuite_l3fwdacl.py @@ -42,7 +42,6 @@ import packet class TestL3fwdacl(TestCase): - exe_path = "./examples/l3fwd-acl/build" all_ipv4_addresses = "0.0.0.0/0" all_ipv6_addresses = "0:0:0:0:0:0:0:0/0" all_ports = "0 : 65535" @@ -173,8 +172,8 @@ class TestL3fwdacl(TestCase): if scalar: extra_args = '--scalar' - cmdline = '%s/l3fwd-acl -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \ - (TestL3fwdacl.exe_path, self.core_mask, self.dut.get_memory_channels(), + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \ + (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db, @@ -592,8 +591,8 @@ class TestL3fwdacl(TestCase): rule_list.append(TestL3fwdacl.default_rule) self.create_acl_ipv4_db(rule_list) - cmdline = '%s/l3fwd-acl -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \ - (TestL3fwdacl.exe_path, self.core_mask, self.dut.get_memory_channels(), + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \ + (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db) @@ -611,8 +610,8 @@ class TestL3fwdacl(TestCase): rule_list.append(TestL3fwdacl.default_rule) self.create_acl_ipv6_db(rule_list) - cmdline = '%s/l3fwd-acl -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \ - (TestL3fwdacl.exe_path, self.core_mask, self.dut.get_memory_channels(), + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"' % \ + (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db) @@ -654,6 +653,7 @@ class TestL3fwdacl(TestCase): # compile l3fwd-acl out = self.dut.build_dpdk_apps("examples/l3fwd-acl") + self.app_l3fwd_acl_path = self.dut.apps_name['l3fwd-acl'] self.verify("Error" not in out, "compilation error 1") self.verify("No such file" not in out, "compilation error 2") @@ -840,8 +840,8 @@ class TestL3fwdacl(TestCase): rule_list_ipv4.append(TestL3fwdacl.invalid_port_rule_ipv4) self.create_acl_ipv4_db(rule_list_ipv4) - cmdline = '%s/l3fwd-acl -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ - (TestL3fwdacl.exe_path, self.core_mask, self.dut.get_memory_channels(), + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ + (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db) @@ -852,8 +852,8 @@ class TestL3fwdacl(TestCase): rule_list_ipv6.append(TestL3fwdacl.invalid_port_rule_ipv6) self.create_acl_ipv6_db(rule_list_ipv6) - cmdline = '%s/l3fwd-acl -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ - (TestL3fwdacl.exe_path, self.core_mask, self.dut.get_memory_channels(), + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ + (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)