[dts] [dts 16/38] tests/TestSuite_l3fwdacl.py: adapt to support both meson and makefile build

test suite reviews and discussions
 help / color / mirror / Atom feed

From: "Zhou, Jun" <junx.w.zhou@intel.com>
To: dts@dpdk.org
Cc: Zhou jun <junx.w.zhou@intel.com>
Subject: [dts] [dts 16/38] tests/TestSuite_l3fwdacl.py: adapt to support both meson and makefile build
Date: Tue,  8 Sep 2020 07:18:03 +0000	[thread overview]
Message-ID: <20200908071825.118583-17-junx.w.zhou@intel.com> (raw)
In-Reply-To: <20200908071825.118583-1-junx.w.zhou@intel.com>

From: Zhou jun <junx.w.zhou@intel.com>

Signed-off-by: Zhou jun <junx.w.zhou@intel.com>
---
 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)
 
-- 
1.8.3.1

next prev parent reply	other threads:[~2020-09-08  7:29 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  7:17 [dts] [PATCH V1 00/38] Modify suites to support meson Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 01/38] tests/TestSuite_cmdline.py: adapt to support both meson and makefile build Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 02/38] tests/TestSuite_coremask.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 03/38] tests/TestSuite_distributor.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 04/38] tests/TestSuite_efd.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 05/38] tests/TestSuite_external_memory.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 06/38] tests/TestSuite_external_mempool_handler.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 07/38] tests/TestSuite_flow_classify_softnic.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 08/38] tests/TestSuite_hello_world.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 09/38] tests/TestSuite_inline_ipsec.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 10/38] tests/TestSuite_ip_pipeline.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 11/38] tests/TestSuite_ipfrag.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 12/38] tests/TestSuite_ipv4_reassembly.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 13/38] tests/TestSuite_keep_alive.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 14/38] tests/TestSuite_kni.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 15/38] tests/TestSuite_l2fwd.py: " Zhou, Jun
2020-09-08  7:18 ` Zhou, Jun [this message]
2020-09-08  7:18 ` [dts] [dts 17/38] tests/TestSuite_link_status_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 18/38] tests/TestSuite_metering_and_policing.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 19/38] tests/TestSuite_multicast.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 20/38] tests/TestSuite_pvp_virtio_user_4k_pages.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 21/38] tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 22/38] tests/TestSuite_short_live.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 23/38] tests/TestSuite_skeleton.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 24/38] tests/TestSuite_timer.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 25/38] tests/TestSuite_userspace_ethtool.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 26/38] tests/TestSuite_vdev_primary_secondary.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 27/38] tests/TestSuite_vhost_pmd_xstats.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 28/38] tests/TestSuite_vhost_user_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 29/38] tests/TestSuite_vhost_virtio_pmd_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 30/38] tests/TestSuite_vhost_virtio_user_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 31/38] tests/TestSuite_virtio_event_idx_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 32/38] tests/TestSuite_virtio_pvp_regression.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 33/38] tests/TestSuite_virtio_user_as_exceptional_path.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 34/38] tests/TestSuite_vm2vm_virtio_net_perf.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 35/38] tests/TestSuite_vm2vm_virtio_pmd.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 36/38] tests/TestSuite_vm2vm_virtio_user.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 37/38] tests/TestSuite_vmdq.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 38/38] tests/TestSuite_vxlan_sample.py: " Zhou, Jun
2020-09-08  7:34 ` [dts] [PATCH V1 00/38] Modify suites to support meson Zhou, JunX W
2020-09-08  9:05   ` Tu, Lijuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200908071825.118583-17-junx.w.zhou@intel.com \
    --to=junx.w.zhou@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).