[dts][PATCH V3 0/5] test_plans/*: modify test plan to adapt meson build

[dts][PATCH V3 0/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build

Yu Jiang (5):
  test_plans/*: modify test plan to adapt meson build
  test_plans/*: modify test plan to adapt meson build
  test_plans/*: modify test plan to adapt meson build
  test_plans/*: modify test plan to adapt meson build
  test_plans/*: modify test plan to adapt meson build

 test_plans/ABI_stable_test_plan.rst           |  9 +---
 ...ckage_download_in_ice_driver_test_plan.rst |  8 ++--
 .../external_mempool_handler_test_plan.rst    | 10 ++---
 test_plans/flow_classify_test_plan.rst        | 11 ++---
 test_plans/generic_flow_api_test_plan.rst     | 10 ++---
 test_plans/iavf_test_plan.rst                 |  8 ++--
 test_plans/ipsec_gw_and_library_test_plan.rst |  2 -
 test_plans/keep_alive_test_plan.rst           | 13 +-----
 test_plans/kernelpf_iavf_test_plan.rst        |  2 +-
 test_plans/linux_modules_test_plan.rst        |  2 -
 test_plans/metrics_test_plan.rst              | 10 ++---
 test_plans/multicast_test_plan.rst            | 44 +++++++++----------
 test_plans/shutdown_api_test_plan.rst         |  2 +-
 test_plans/telemetry_test_plan.rst            | 14 +++---
 .../vdev_primary_secondary_test_plan.rst      | 24 ++++++----
 test_plans/vf_packet_rxtx_test_plan.rst       |  2 +-
 test_plans/vf_pf_reset_test_plan.rst          | 22 +++++-----
 test_plans/vhost_qemu_mtu_test_plan.rst       |  4 +-
 test_plans/vm2vm_virtio_user_test_plan.rst    |  4 +-
 test_plans/vmdq_dcb_test_plan.rst             |  4 --
 20 files changed, 96 insertions(+), 109 deletions(-)

-- 
2.25.1

[dts][PATCH V3 1/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build,
including vf_pf_reset,vhost_qemu_mtu,vm2vm_virtio_user,vmdq_dcb

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/vf_pf_reset_test_plan.rst       | 22 +++++++++++-----------
 test_plans/vhost_qemu_mtu_test_plan.rst    |  4 ++--
 test_plans/vm2vm_virtio_user_test_plan.rst |  4 ++--
 test_plans/vmdq_dcb_test_plan.rst          |  4 ----
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/test_plans/vf_pf_reset_test_plan.rst b/test_plans/vf_pf_reset_test_plan.rst
index 574d4510..d3a9f505 100644
--- a/test_plans/vf_pf_reset_test_plan.rst
+++ b/test_plans/vf_pf_reset_test_plan.rst
@@ -90,7 +90,7 @@ Test Case 1: vf reset -- create two vfs on one pf
 
 5. Run testpmd::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 -- -i \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 -- -i \
      --portmask=0x3
      testpmd> set fwd mac
      testpmd> start
@@ -159,11 +159,11 @@ Test Case 2: vf reset -- create two vfs on one pf, run testpmd separately
 
 2. Start testpmd on two vf ports::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4  \
+     ./<build_target>/app/dpdk-testpmd -c 0xf -n 4  \
      --socket-mem 1024,1024 -a 81:02.0 --file-prefix=test1  \
      -- -i --eth-peer=0,00:11:22:33:44:12  \
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf0 -n 4  \
+     ./<build_target>/app/dpdk-testpmd -c 0xf0 -n 4  \
      --socket-mem 1024,1024 -a 81:02.1 --file-prefix=test2  \
      -- -i
 
@@ -207,7 +207,7 @@ Test Case 3: vf reset -- create one vf on each pf
 
 3. Start one testpmd on two vf ports::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 -- -i \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 -- -i \
      --portmask=0x3
 
 4. Start forwarding::
@@ -234,7 +234,7 @@ Test Case 4: vlan rx restore -- vf reset all ports
 
 1. Execute the step1-step3 of test case 1, then start the testpmd::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 -- -i \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 -- -i \
      --portmask=0x3
      testpmd> set fwd mac
 
@@ -289,7 +289,7 @@ test Case 5: vlan rx restore -- vf reset one port
 
 1. Execute the step1-step3 of test case 1, then start the testpmd::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 -- -i  \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 -- -i  \
      --portmask=0x3
      testpmd> set fwd mac
 
@@ -429,7 +429,7 @@ Test Case 7: vlan tx restore
 
 2. Run testpmd::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 -- -i \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 -- -i \
      --portmask=0x3
 
 3. Add tx vlan offload on VF1 port, take care the first param is port,
@@ -473,7 +473,7 @@ test Case 8: MAC address restore
 
 3. Start testpmd on two vf ports::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4  \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4  \
      -- -i --portmask=0x3
 
 4. Add MAC address to the vf0 ports::
@@ -544,7 +544,7 @@ test Case 9: vf reset (two vfs passed through to one VM)
    bind them to igb_uio driver,and then start testpmd::
 
      ./usertools/dpdk-devbind.py -b igb_uio 00:05.0 00:05.1
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x0f -n 4 \
+     ./<build_target>/app/dpdk-testpmd -c 0x0f -n 4 \
      -a 00:05.0 -a 00:05.1 -- -i --portmask=0x3
 
 5. Add MAC address to the vf0 ports, set it in mac forward mode::
@@ -618,14 +618,14 @@ test Case 10: vf reset (two vfs passed through to two VM)
    bind the port to igb_uio, then start testpmd on vf0 port::
 
      ./tools/dpdk_nic_bind.py --bind=igb_uio 00:05.0
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4  \
+     ./<build_target>/app/dpdk-testpmd -c 0xf -n 4  \
      -- -i --eth-peer=0,vf1port_macaddr  \
 
    login vm1, got VF1 pci device id in vm1, assume it's 00:06.0,
    bind the port to igb_uio, then start testpmd on vf1 port::
 
      ./tools/dpdk_nic_bind.py --bind=igb_uio 00:06.0
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf0 -n 4  \
+     ./<build_target>/app/dpdk-testpmd -c 0xf0 -n 4  \
      -- -i
 
 5. Add vlan on vf0 in vm0, and set fwd mode::
diff --git a/test_plans/vhost_qemu_mtu_test_plan.rst b/test_plans/vhost_qemu_mtu_test_plan.rst
index 60b01cfb..62c2f7f8 100644
--- a/test_plans/vhost_qemu_mtu_test_plan.rst
+++ b/test_plans/vhost_qemu_mtu_test_plan.rst
@@ -46,7 +46,7 @@ Test Case: Test the MTU in virtio-net
 =====================================
 1. Launch the testpmd by below commands on host, and config mtu::
 
-    ./testpmd -c 0xc -n 4 \
+    ./<build_target>/app/dpdk-testpmd -c 0xc -n 4 \
     --vdev 'net_vhost0,iface=vhost-net,queues=1' \
     -- -i --txd=512 --rxd=128 --nb-cores=1 --port-topology=chained
     testpmd> set fwd mac
@@ -70,7 +70,7 @@ Test Case: Test the MTU in virtio-net
 4. Bind the virtio driver to igb_uio, launch testpmd in VM, and verify 
    the mtu in port info is 9000::
  
-    ./testpmd -c 0x03 -n 3 \
+    ./<build_target>/app/dpdk-testpmd -c 0x03 -n 3 \
     -- -i --txd=512 --rxd=128 --tx-offloads=0x0 --enable-hw-vlan-strip
     testpmd> set fwd mac
     testpmd> start
diff --git a/test_plans/vm2vm_virtio_user_test_plan.rst b/test_plans/vm2vm_virtio_user_test_plan.rst
index 6fc5f89f..c3aa328e 100644
--- a/test_plans/vm2vm_virtio_user_test_plan.rst
+++ b/test_plans/vm2vm_virtio_user_test_plan.rst
@@ -1599,13 +1599,13 @@ Test Case 24: packed virtqueue vm2vm vectorized-tx path multi-queues test indire
 
 1. Launch vhost by below command::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -l 1-2 -n 4 --no-pci \
+    ./<build_target>/app/dpdk-testpmd -l 1-2 -n 4 --no-pci \
     --vdev 'eth_vhost0,iface=vhost-net,queues=1' --vdev 'eth_vhost1,iface=vhost-net1,queues=1' -- \
     -i --nb-cores=1 --no-flush-rx
 
 2. Launch virtio-user1 by below command::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -n 4 -l 7-8 --no-pci --file-prefix=virtio1 --force-max-simd-bitwidth=512 \
+    ./<build_target>/app/dpdk-testpmd -n 4 -l 7-8 --no-pci --file-prefix=virtio1 --force-max-simd-bitwidth=512 \
     --vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,packed_vq=1,mrg_rxbuf=1,in_order=1,vectorized=1,queue_size=256 \
     -- -i --nb-cores=1 --txd=256 --rxd=256
     testpmd>set fwd rxonly
diff --git a/test_plans/vmdq_dcb_test_plan.rst b/test_plans/vmdq_dcb_test_plan.rst
index 1c9b82ef..a4beaa93 100644
--- a/test_plans/vmdq_dcb_test_plan.rst
+++ b/test_plans/vmdq_dcb_test_plan.rst
@@ -64,7 +64,6 @@ Prerequisites
   to the pools numbers(inclusive) and the VLAN user priority field increments from
   0 to 7 (inclusive) for each VLAN ID.
 - Build vmdq_dcb example,
-    make: make -C examples/vmdq_dcb RTE_SDK=`pwd` T=x86_64-native-linuxapp-gcc
     meson: ./<build_target>/examples/dpdk-vmdq_dcb -c 0xff -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 --enable-rss
 
 Test Case 1: Verify VMDQ & DCB with 32 Pools and 4 TCs
@@ -72,7 +71,6 @@ Test Case 1: Verify VMDQ & DCB with 32 Pools and 4 TCs
 
 1. Run the application as the following::
 
-    make: ./examples/vmdq_dcb/build/vmdq_dcb_app -c 0xff -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 --enable-rss
     meson: ./<build_target>/examples/dpdk-vmdq_dcb -c 0xff -n 4 -- -p 0x3 --nb-pools 32 --nb-tcs 4 --enable-rss
 
 2. Start traffic transmission using approx 10% of line rate.
@@ -98,7 +96,6 @@ Test Case 2: Verify VMDQ & DCB with 16 Pools and 8 TCs
 
 2. Repeat Test Case 1, with `--nb-pools 16` and `--nb-tcs 8` of the sample application::
 
-    make: ./examples/vmdq_dcb/build/vmdq_dcb_app -c 0xff -n 4 -- -p 0x3 --nb-pools 16 --nb-tcs 8 --enable-rss
     meson: ./<build_target>/examples/dpdk-vmdq_dcb -c 0xff -n 4 -- -p 0x3 --nb-pools 16 --nb-tcs 8 --enable-rss
 
 Expected result:
@@ -111,7 +108,6 @@ Expected result:
 
 4. Repeat Test Case 1, with `--nb-pools 16` and `--nb-tcs 8` of the sample application::
 
-    make: ./examples/vmdq_dcb/build/vmdq_dcb_app -c 0xff -n 4 -- -p 0x3 --nb-pools 16 --nb-tcs 8 --enable-rss
     meson: ./<build_target>/examples/dpdk-vmdq_dcb -c 0xff -n 4 -- -p 0x3 --nb-pools 16 --nb-tcs 8 --enable-rss
 
 Expected result:
-- 
2.25.1

[dts][PATCH V3 2/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build,
including linux_modules,metrics,multicast,shutdown_api

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/linux_modules_test_plan.rst |  2 --
 test_plans/metrics_test_plan.rst       | 10 +++---
 test_plans/multicast_test_plan.rst     | 44 +++++++++++++-------------
 test_plans/shutdown_api_test_plan.rst  |  2 +-
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/test_plans/linux_modules_test_plan.rst b/test_plans/linux_modules_test_plan.rst
index e8d41996..35b120fc 100644
--- a/test_plans/linux_modules_test_plan.rst
+++ b/test_plans/linux_modules_test_plan.rst
@@ -148,12 +148,10 @@ application.
 
 Compile the application ::
 
-    make: # cd $RTE_SDK/examples/helloworld && make
     meson: meson configure -Dexamples=helloworld <build_target>;ninja -C <build_target>
 
 Run the application ::
 
-    make: $ $RTE_SDK/examples/helloworld/build/helloworld-shared --in-memory
     meson: $ ./<build_target>/examples/dpdk-helloworld --in-memory
 
 Check for any error states or reported errors.
diff --git a/test_plans/metrics_test_plan.rst b/test_plans/metrics_test_plan.rst
index 22c31f34..2ba3617d 100644
--- a/test_plans/metrics_test_plan.rst
+++ b/test_plans/metrics_test_plan.rst
@@ -35,11 +35,11 @@ metrics
 =======
 
 The Metrics implements a mechanism by which *producers* can publish numeric
-information for later querying by *consumers*. Here dpdk-procinfo process is the
+information for later querying by *consumers*. Here dpdk-proc-info process is the
 *consumers*. ``latency stats`` and ``bit rate`` are the two implements based
 on metrics lib.
 
-The dpdk-procinfo process use new command line option "--metrics" to display
+The dpdk-proc-info process use new command line option "--metrics" to display
 metrics statistics.
 
 Functionality:
@@ -178,7 +178,7 @@ Test Case : test latency stats
 #. run dpdk-proc to get latency stats data, query data at a average interval and
    get 5 times data::
 
-   ./x86_64-native-linuxapp-gcc/app/dpdk-procinfo -- --metrics
+   ./x86_64-native-linuxapp-gcc/app/dpdk-proc-info -- --metrics
 
 #. latency stats has no reference standard data, only check non-zero and logic reasonable value.
 
@@ -203,7 +203,7 @@ Test Case : test bit rate
 #. run dpdk-proc to get latency stats data, query data at a average interval and
    get 5 times data::
 
-   ./x86_64-native-linuxapp-gcc/app/dpdk-procinfo -- --metrics
+   ./x86_64-native-linuxapp-gcc/app/dpdk-proc-info -- --metrics
 
 #. Compare dpdk statistics data with packet generator statistics data.
 
@@ -228,7 +228,7 @@ Test Case : test bit rate peak value
 #. run dpdk-proc to get latency stats data, query data at a average interval and
    get 5 times data::
 
-   ./x86_64-native-linuxapp-gcc/app/dpdk-procinfo -- --metrics
+   ./x86_64-native-linuxapp-gcc/app/dpdk-proc-info -- --metrics
 
 #. decline packet generator rate percent from 100%/80%/60%/20%, loop step 5/6.
 
diff --git a/test_plans/multicast_test_plan.rst b/test_plans/multicast_test_plan.rst
index 87b3dc78..11d84347 100644
--- a/test_plans/multicast_test_plan.rst
+++ b/test_plans/multicast_test_plan.rst
@@ -240,7 +240,7 @@ Here is a table which shows the requirements for which TG flows should arrive fr
 Assuming that ports ``0`` and ``2`` are connected to a traffic generator,
 launch the ``ipv4_multicast`` with the following arguments::
 
-  ./examples/ipv4_multicast/build/ipv4_multicast -c 0x2 -n 1 -- -p 0x5 -q 2
+  ./<build_target>/examples/dpdk-ipv4_multicast -c 0x2 -n 1 -- -p 0x5 -q 2
 
 If the app run successfully, it will be the same as the shown in the terminal. ::
 
@@ -302,24 +302,24 @@ used during test execution.
 
 |
 
-+-----+-------------------------------------------------------+
-| #   | Command Line                                          |
-+-----+-------------------------------------------------------+
-|1    |./ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
-+-----+-------------------------------------------------------+
-|2    |./ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
-+-----+-------------------------------------------------------+
-|3    |./ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
-+-----+-------------------------------------------------------+
-|4    |./ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
-+-----+-------------------------------------------------------+
-|5    |./ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
-+-----+-------------------------------------------------------+
-|6    |./ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
-+-----+-------------------------------------------------------+
-|7    |./ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
-+-----+-------------------------------------------------------+
-|8    |./ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
-+-----+-------------------------------------------------------+
-|9    |./ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
-+-----+-------------------------------------------------------+
++-----+------------------------------------------------------------------------------------+
+| #   | Command Line                                                                       |
++-----+------------------------------------------------------------------------------------+
+|1    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
++-----+------------------------------------------------------------------------------------+
+|2    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
++-----+------------------------------------------------------------------------------------+
+|3    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
++-----+------------------------------------------------------------------------------------+
+|4    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
++-----+------------------------------------------------------------------------------------+
+|5    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
++-----+------------------------------------------------------------------------------------+
+|6    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
++-----+------------------------------------------------------------------------------------+
+|7    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x40 -n 3 -- -p PORTMASK -q 2      |
++-----+------------------------------------------------------------------------------------+
+|8    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x400040 -n 3 -- -p PORTMASK -q 1  |
++-----+------------------------------------------------------------------------------------+
+|9    |./<build_target>/examples/dpdk-ipv4_multicast -c 0x30 -n 3 -- -p PORTMASK -q 1      |
++-----+------------------------------------------------------------------------------------+
diff --git a/test_plans/shutdown_api_test_plan.rst b/test_plans/shutdown_api_test_plan.rst
index 5a44b78d..a22481a6 100644
--- a/test_plans/shutdown_api_test_plan.rst
+++ b/test_plans/shutdown_api_test_plan.rst
@@ -179,7 +179,7 @@ This case support all the nic with driver i40e and ixgbe.
    bind a VF to DPDK::
     ./usertools/dpdk-devbind.py -b igb_uio 1b:02.0
 3. launch testpmd with cmd::
-    ./x86_64-native-linuxapp-gcc/app/testpmd -l 0-3 -n 4 --file-prefix=minjq -- -i
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 0-3 -n 4 --file-prefix=minjq -- -i
 4. Run ``port stop all`` to stop all ports.
 5. Run ``port config all speed SPEED duplex HALF/FULL`` to select the new config for the link.
 6. Run ``port start all`` to restart all ports.
-- 
2.25.1

[dts][PATCH V3 3/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build,
including iavf,ipsec_gw_and_library,keep_alive,kernelpf_iavf

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/iavf_test_plan.rst                 |  8 ++++----
 test_plans/ipsec_gw_and_library_test_plan.rst |  2 --
 test_plans/keep_alive_test_plan.rst           | 13 ++-----------
 test_plans/kernelpf_iavf_test_plan.rst        |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/test_plans/iavf_test_plan.rst b/test_plans/iavf_test_plan.rst
index c055cd83..ddd7fbb9 100644
--- a/test_plans/iavf_test_plan.rst
+++ b/test_plans/iavf_test_plan.rst
@@ -54,7 +54,7 @@ Prerequisites
 
 2. Start testpmd on host to configure VF ports' mac::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -l 1-5 -n 4  -- -i
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1-5 -n 4  -- -i
 
     testpmd>set vf mac addr 0 0 00:12:34:56:78:01
     testpmd>set vf mac addr 1 0 00:12:34:56:78:02
@@ -79,7 +79,7 @@ Test case: VF basic RX/TX
 ---------------------------
 1. Start testpmd on VM::
 
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 1  -- -i
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3 -n 1  -- -i
 
 2. Check and verify packets which received and forwarded
 
@@ -89,7 +89,7 @@ Test Cases: VF mac filter
 
 Start testpmd on VM::
 
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 1  -- -i
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3 -n 1  -- -i
 
 Test Case: unicast test
 ------------------------
@@ -141,7 +141,7 @@ Test Cases: VF VLAN feature vlan filter only work with promisc mode off
 
 Start testpmd on VM::
 
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0x3 -n 1  -- -i
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3 -n 1  -- -i
 
 Test Case: vlan filter
 ---------------------------
diff --git a/test_plans/ipsec_gw_and_library_test_plan.rst b/test_plans/ipsec_gw_and_library_test_plan.rst
index 1cd80783..8d51b684 100644
--- a/test_plans/ipsec_gw_and_library_test_plan.rst
+++ b/test_plans/ipsec_gw_and_library_test_plan.rst
@@ -125,8 +125,6 @@ The test commands of ipsec-secgw is below::
 
 compile the applications::
 
-    make -C ./examples/ipsec-secgw
-
     meson:
     meson configure -Dexamples=ipsec-secgw <build_target>
     ninja -C <build_target>
diff --git a/test_plans/keep_alive_test_plan.rst b/test_plans/keep_alive_test_plan.rst
index 81c1c74f..41b5e4e0 100644
--- a/test_plans/keep_alive_test_plan.rst
+++ b/test_plans/keep_alive_test_plan.rst
@@ -49,15 +49,6 @@ Compiling the Application
 =========================
 
 To compile the application:
-
-Go to the sample application directory::
-
-   export RTE_SDK=/path/to/rte_sdk cd ${RTE_SDK}/examples/keep_alive
-
-Set the target (a default target is used if not specified). For example::
-
-   export RTE_TARGET=x86_64-native-linuxapp-gcc
-
 See the DPDK Getting Started Guide for possible RTE_TARGET values.
 Build the application::
 
@@ -69,7 +60,7 @@ Running the Application
 
 The application has a number of command line options::
 
-   ./build/l2fwd-keepalive [EAL options] -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD]
+   ./<build_target>/examples/dpdk-l2fwd-keepalive [EAL options] -- -p PORTMASK [-q NQ] [-K PERIOD] [-T PERIOD]
 
 where,
 
@@ -80,6 +71,6 @@ where,
 
 To run the application in linuxapp environment with 4 lcores, 16 ports 8 RX queues per lcore and a ping interval of 10ms, issue the command::
 
-    ./build/l2fwd-keepalive -c f -n 4 -- -q 8 -p ffff -K 10
+    ./<build_target>/examples/dpdk-l2fwd-keepalive -c f -n 4 -- -q 8 -p ffff -K 10
 
 Refer to the DPDK Getting Started Guide for general information on running applications and the Environment Abstraction Layer (EAL) options.
diff --git a/test_plans/kernelpf_iavf_test_plan.rst b/test_plans/kernelpf_iavf_test_plan.rst
index 45c217e4..9c10b125 100644
--- a/test_plans/kernelpf_iavf_test_plan.rst
+++ b/test_plans/kernelpf_iavf_test_plan.rst
@@ -653,7 +653,7 @@ Bind VFs to vfio-pci::
 
 Start l3fwd power with one queue per port::
 
-    ./examples/l3fwd-power/build/l3fwd-power -l 6,7 -n 4 -- \
+    ./<build_target>/examples/dpdk-l3fwd-power -l 6,7 -n 4 -- \
     -p 0x3 --config '(0,0,6),(1,0,7)'
 
 Send one packet to VF0 and VF1, check that thread on core6 and core7 waked up::
-- 
2.25.1

[dts][PATCH V3 4/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build,
including ABI_stable,enable_package_download_in_ice_driver,
external_mempool_handler,flow_classify,generic_flow_api

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/ABI_stable_test_plan.rst                   |  9 +--------
 ...nable_package_download_in_ice_driver_test_plan.rst |  8 ++++----
 test_plans/external_mempool_handler_test_plan.rst     | 10 +++++-----
 test_plans/flow_classify_test_plan.rst                | 11 ++++++-----
 test_plans/generic_flow_api_test_plan.rst             | 10 +++++-----
 5 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/test_plans/ABI_stable_test_plan.rst b/test_plans/ABI_stable_test_plan.rst
index ae0eb7b9..5408e2a9 100644
--- a/test_plans/ABI_stable_test_plan.rst
+++ b/test_plans/ABI_stable_test_plan.rst
@@ -47,13 +47,7 @@ Compiling Steps
 ===============
 
 Compile shared library/application from DPDK xx.11 release.
-Change the option in config/common_base configuration file::
-
-  CONFIG_RTE_BUILD_SHARED_LIB=y
-
-And then, compile the DPDK::
-
-  make install -j T=x86_64-native-linuxapp-gcc
+CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=shared <build_target>;ninja -C <build_target>
 
 Keep this DPDK folder as <dpdk_xx11>, e.g. <dpdk_1911>.
 
@@ -65,7 +59,6 @@ Setup library path in environment::
 
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH,<dpdk_2002>
 
-meson: CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=shared <build_target>;ninja -C <build_target>
 
 Common Test Steps
 =================
diff --git a/test_plans/enable_package_download_in_ice_driver_test_plan.rst b/test_plans/enable_package_download_in_ice_driver_test_plan.rst
index 6de17a0b..b81e4e79 100644
--- a/test_plans/enable_package_download_in_ice_driver_test_plan.rst
+++ b/test_plans/enable_package_download_in_ice_driver_test_plan.rst
@@ -67,7 +67,7 @@ Test case 1: Download the package successfully
 
 2. Start the testpmd::
 
-    ./testpmd -c 0x3fe -n 6 -- -i --nb-cores=8 --rxq=8 --txq=8 \
+    ./<build_target>/app/dpdk-testpmd -c 0x3fe -n 6 -- -i --nb-cores=8 --rxq=8 --txq=8 \
     --port-topology=chained
 
    The testpmd can be started normally without any fail information.
@@ -103,7 +103,7 @@ Test case 2: Driver enters Safe Mode successfully
 
 2. Start testpmd::
 
-    ./testpmd -c 0x3fe -n 6 \
+    ./<build_target>/app/dpdk-testpmd -c 0x3fe -n 6 \
     -a PORT0_PCI,safe-mode-support=1 -a PORT1_PCI,safe-mode-support=1 \
     -- -i --nb-cores=8 --rxq=8 --txq=8 --port-topology=chained
 
@@ -144,7 +144,7 @@ Test case 3: Driver enters Safe Mode failed
 
 2. Start testpmd::
 
-    ./testpmd -c 0x3fe -n 6 -- -i --nb-cores=8 --rxq=8 --txq=8 \
+    ./<build_target>/app/dpdk-testpmd -c 0x3fe -n 6 -- -i --nb-cores=8 --rxq=8 --txq=8 \
     --port-topology=chained
 
    There will be an error reported::
@@ -177,7 +177,7 @@ Compile DPDK and testpmd::
 
 Launch testpmd with 1 default interface and 1 specific interface::
 
-  ./x86_64-native-linux-gcc/app/testpmd -l 6-9 -n 4 -a 18:00.0 -a b1:00.0 --log-level=8 -- -i
+  ./<build_target>/app/dpdk-testpmd -l 6-9 -n 4 -a 18:00.0 -a b1:00.0 --log-level=8 -- -i
 
 In this case, b1:00.0 interface is specific interface.
 
diff --git a/test_plans/external_mempool_handler_test_plan.rst b/test_plans/external_mempool_handler_test_plan.rst
index 2f821364..c773dc0b 100644
--- a/test_plans/external_mempool_handler_test_plan.rst
+++ b/test_plans/external_mempool_handler_test_plan.rst
@@ -54,7 +54,7 @@ Test Case 1: Multiple producers and multiple consumers
 
 3. Start testpmd with two ports and start forwarding::
 
-      testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
+      ./<build_target>/app/dpdk-testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
       testpmd> set fwd mac
       testpmd> start
 
@@ -75,7 +75,7 @@ Test Case 2: Single producer and Single consumer
 
 3. Start testpmd with two ports and start forwarding::
 
-      testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
+      ./<build_target>/app/dpdk-testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
       testpmd> set fwd mac
       testpmd> start
 
@@ -96,7 +96,7 @@ Test Case 3: Single producer and Multiple consumers
 
 3. Start testpmd with two ports and start forwarding::
 
-      testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
+      ./<build_target>/app/dpdk-testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
       testpmd> set fwd mac
       testpmd> start
 
@@ -117,7 +117,7 @@ Test Case 4: Multiple producers and single consumer
 
 3. Start testpmd with two ports and start forwarding::
 
-      testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
+      ./<build_target>/app/dpdk-testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
       testpmd> set fwd mac
       testpmd> start
 
@@ -138,7 +138,7 @@ Test Case 4: Stack mempool handler
 
 3. Start testpmd with two ports and start forwarding::
 
-      testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
+      ./<build_target>/app/dpdk-testpmd -c 0x6 -n 4  -- -i --portmask=0x3 --tx-offloads=0x8fff
       testpmd> set fwd mac
       testpmd> start
 
diff --git a/test_plans/flow_classify_test_plan.rst b/test_plans/flow_classify_test_plan.rst
index 07236172..4175ed7c 100644
--- a/test_plans/flow_classify_test_plan.rst
+++ b/test_plans/flow_classify_test_plan.rst
@@ -168,14 +168,15 @@ Compilation:
 ------------
 steps::
 
-    cd $DPDK_PATH
-    export RTE_TARGET=$DPDK_PATH
-    export RTE_SDK=`pwd`
-    make -C examples/flow_classify
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
+
+    meson configure -Dexamples=flow_classify <build_target>
+    ninja -C <build_target>
 
 Flow classify bin file under::
 
-    $DPDK_PATH/examples/flow_classify/build/flow_classify
+    <build_target>/examples/dpdk-flow_classify
 
 rule config file(default)::
 
diff --git a/test_plans/generic_flow_api_test_plan.rst b/test_plans/generic_flow_api_test_plan.rst
index 98baec62..6fd039a0 100644
--- a/test_plans/generic_flow_api_test_plan.rst
+++ b/test_plans/generic_flow_api_test_plan.rst
@@ -222,12 +222,12 @@ Test case: Fortville fdir for ipv4
     testpmd> set verbose 1
     testpmd> start
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 1e0000 -n 4 -a 05:02.0 --file-prefix=vf0 --socket-mem=1024,1024 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 1e0000 -n 4 -a 05:02.0 --file-prefix=vf0 --socket-mem=1024,1024 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect
     testpmd> set fwd rxonly
     testpmd> set verbose 1
     testpmd> start
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 1e00000 -n 4 -a 05:02.1 --file-prefix=vf1 --socket-mem=1024,1024 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 1e00000 -n 4 -a 05:02.1 --file-prefix=vf1 --socket-mem=1024,1024 -- -i --rxq=4 --txq=4 --disable-rss --pkt-filter-mode=perfect
     testpmd> set fwd rxonly
     testpmd> set verbose 1
     testpmd> start
@@ -2009,7 +2009,7 @@ Test case: Dual vlan(QinQ)
 
    1. set up testpmd with Fortville NICs::
 
-         ./dpdk-testpmd -c 0x1ffff -n 4 -- -i --coremask=0x1fffe --portmask=0x1 --rxq=16 --txq=16 --tx-offloads=0x8fff
+         ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1ffff -n 4 -- -i --coremask=0x1fffe --portmask=0x1 --rxq=16 --txq=16 --tx-offloads=0x8fff
 
    2. verbose configuration::
 
@@ -2107,7 +2107,7 @@ Test Case: 10GB Multiple filters
 
    1. set up testpmd with Fortville NICs::
 
-         ./dpdk-testpmd -l 1,2,3,4,5,6,7,8 -n 4 -- -i --disable-rss --rxq=16 --txq=16
+         ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1,2,3,4,5,6,7,8 -n 4 -- -i --disable-rss --rxq=16 --txq=16
 
    2. verbose configuration::
 
@@ -2220,7 +2220,7 @@ This case is designed for NIC(niantic). Default use 64 queues for test
 
 Launch the app ``testpmd`` with the following arguments::
 
-    ./dpdk-testpmd -l 1,2,3,4,5 -n 4 -- -i --disable-rss --rxq=64 --txq=64 --portmask=0x3 --nb-cores=4 --total-num-mbufs=263168
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1,2,3,4,5 -n 4 -- -i --disable-rss --rxq=64 --txq=64 --portmask=0x3 --nb-cores=4 --total-num-mbufs=263168
 
     testpmd>set stat_qmap rx 0 0 0
     testpmd>set stat_qmap rx 1 0 0
-- 
2.25.1

[dts][PATCH V3 5/5] test_plans/*: modify test plan to adapt meson build

[Yu Jiang]

test_plans/*: modify test plan to adapt meson build,
including telemetry,vdev_primary_secondary,vf_packet_rxtx

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/telemetry_test_plan.rst            | 14 +++++++----
 .../vdev_primary_secondary_test_plan.rst      | 24 ++++++++++++-------
 test_plans/vf_packet_rxtx_test_plan.rst       |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/test_plans/telemetry_test_plan.rst b/test_plans/telemetry_test_plan.rst
index 07983206..4dd63681 100644
--- a/test_plans/telemetry_test_plan.rst
+++ b/test_plans/telemetry_test_plan.rst
@@ -58,9 +58,13 @@ Prerequisites
 1. Enable the telemetry API by modifying the following config option before building DPDK::
 
 	Python >= 2.5
-	Jansson library for JSON serialization
-	CONFIG_RTE_LIBRTE_TELEMETRY=y  and libjansson should be available
-	make install RTE_SDK=`pwd` T=x86_64-native-linuxapp-gcc
+	Jansson library for JSON serialization, libjansson should be available
+	RTE_LIB_TELEMETRY is 1 by default in <build_target>/rte_build_config.h:
+	  #define RTE_LIB_TELEMETRY 1
+
+    Build DPDK:
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
 
 2. Configiure PF
 
@@ -68,7 +72,7 @@ Prerequisites
 	insmod x86_64-native-linuxapp-gcc/kmod/igb_uio.ko;
 
 3.   Launch testpmd as the primary application with the ``telemetry``
-	./app/testpmd --telemetry
+	./<build_target>/app/dpdk-testpmd --telemetry
 
 4.   Launch the ``telemetry`` python script with a client filepath :
 
@@ -95,7 +99,7 @@ Test case: basic connection for testpmd and telemetry client::
 
    For the building meson shared and make shared . tested command should be used  when run on ubuntu OS
    make share and meson version::
-   $ ./app/testpmd  -c f -n 4 -d librte_mempool_ring.so -d librte_telemetry.so --telemetry --socket-mem=1024,1024 -- -i
+   $ ./<build_target>/app/dpdk-testpmd  -c f -n 4 -d librte_mempool_ring.so -d librte_telemetry.so --telemetry --socket-mem=1024,1024 -- -i
 
  3.Run Python terminal:
 	python dpdk-telemetry-client.py
diff --git a/test_plans/vdev_primary_secondary_test_plan.rst b/test_plans/vdev_primary_secondary_test_plan.rst
index cb78d192..b9ffd030 100644
--- a/test_plans/vdev_primary_secondary_test_plan.rst
+++ b/test_plans/vdev_primary_secondary_test_plan.rst
@@ -91,14 +91,20 @@ The secondary symmetric_mp instances must also have these parameters specified,
 and the first two must be the same as those passed to the primary instance, or errors
 result.
 
-For example, to run a set of four symmetric_mp instances, running on lcores 1-4, all
+For example,
+to build symmetric_mp::
+
+    meson configure -Dexamples=multi_process/symmetric_mp <build_target>
+    ninja -C <build_target>
+
+to run a set of four symmetric_mp instances, running on lcores 1-4, all
 performing level-2 forwarding of packets between ports 0 and 1, the following
 commands can be used (assuming run as root)::
 
-   ./build/symmetric_mp -c 2 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0
-   ./build/symmetric_mp -c 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1
-   ./build/symmetric_mp -c 8 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2
-   ./build/symmetric_mp -c 10 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3
+   ./<build_target>/examples/dpdk-symmetric_mp -c 2 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=0
+   ./<build_target>/examples/dpdk-symmetric_mp -c 4 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=1
+   ./<build_target>/examples/dpdk-symmetric_mp -c 8 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=2
+   ./<build_target>/examples/dpdk-symmetric_mp -c 10 --proc-type=auto -- -p 3 --num-procs=4 --proc-id=3
 
 To run only 1 or 2 instances, the above parameters to the 1 or 2 instances being
 run should remain the same, except for the ``num-procs`` value, which should be
@@ -168,8 +174,8 @@ SW preparation: Change one line of the symmetric_mp sample and rebuild::
 
 4. Launch two process by example::
 
-    ./examples/multi_process/symmetric_mp/build/symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=2 --proc-id=0
-    ./examples/multi_process/symmetric_mp/build/symmetric_mp -l 2 -n 4 --proc-type=secondary -- -p 3 --num-procs=2 --proc-id=1
+    ./<build_target>/examples/dpdk-symmetric_mp -l 1 -n 4 --proc-type=auto -- -p 3 --num-procs=2 --proc-id=0
+    ./<build_target>/examples/dpdk-symmetric_mp -l 2 -n 4 --proc-type=secondary -- -p 3 --num-procs=2 --proc-id=1
 
 5. Quit all process, check the packets number in rx/tx statistic like below for both primary process and secondary process::
 
@@ -206,7 +212,7 @@ Test Case 2: Virtio-pmd primary and secondary process hotplug test
 
 4. Start sample code as primary process::
 
-    ./examples/multi_process/hotplug_mp/build/hotplug_mp --proc-type=auto -- -p 3 --num-procs=2 --proc-id=0
+    ./<build_target>/examples/dpdk-symmetric_mp --proc-type=auto -- -p 3 --num-procs=2 --proc-id=0
     example> list
     list all etherdev
     0       0000:00:05.0
@@ -214,7 +220,7 @@ Test Case 2: Virtio-pmd primary and secondary process hotplug test
 
 5. Start sample code as secondary process::
 
-    ./examples/multi_process/hotplug_mp/build/hotplug_mp --proc-type=secondary -- -p 3 --num-procs=2 --proc-id=1
+    ./<build_target>/examples/dpdk-symmetric_mp --proc-type=secondary -- -p 3 --num-procs=2 --proc-id=1
     example> list
     list all etherdev
     0       0000:00:05.0
diff --git a/test_plans/vf_packet_rxtx_test_plan.rst b/test_plans/vf_packet_rxtx_test_plan.rst
index a3ff86cb..69b18038 100644
--- a/test_plans/vf_packet_rxtx_test_plan.rst
+++ b/test_plans/vf_packet_rxtx_test_plan.rst
@@ -311,7 +311,7 @@ this case pf in kernel
       testpmd> set fwd mac
       testpmd> start
 7. On vm 1::
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 1  -- -i
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 1  -- -i
 
 8. On vm0::
 
-- 
2.25.1

RE: [dts][PATCH V3 5/5] test_plans/*: modify test plan to adapt meson build

[Tu, Lijuan]

> -----Original Message-----
> From: Jiang, YuX <yux.jiang@intel.com>
> Sent: 2022年2月24日 21:47
> To: Tu, Lijuan <lijuan.tu@intel.com>; dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts][PATCH V3 5/5] test_plans/*: modify test plan to adapt meson
> build
> 
> test_plans/*: modify test plan to adapt meson build, including
> telemetry,vdev_primary_secondary,vf_packet_rxtx
> 
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>

Series applied, thanks