[dts] [PATCH V1] test_plans/cvl_*:modify test plan to adapt meson build

[dts] [PATCH V1] test_plans/cvl_*:modify test plan to adapt meson build

[Zhimin Huang]

modify dpdk app/example name and take build type to meson.
for example:
1.testpmd to dpdk-testpmd.
2.make install to meson build.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 .../cvl_advanced_iavf_rss_gtpu_test_plan.rst  |  2 +-
 .../cvl_advanced_rss_gtpogre_test_plan.rst    | 10 +++---
 .../cvl_advanced_rss_gtpu_test_plan.rst       | 34 +++++++++----------
 .../cvl_advanced_rss_pppoe_test_plan.rst      |  4 +--
 test_plans/cvl_advanced_rss_test_plan.rst     |  4 +--
 ...ed_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst |  4 +--
 test_plans/cvl_dcf_acl_filter_test_plan.rst   |  3 +-
 test_plans/cvl_dcf_date_path_test_plan.rst    |  2 +-
 .../cvl_dcf_switch_filter_gtpu_test_plan.rst  |  3 +-
 .../cvl_dcf_switch_filter_pppoe_test_plan.rst |  6 ++--
 .../cvl_dcf_switch_filter_test_plan.rst       | 14 ++++----
 test_plans/cvl_fdir_test_plan.rst             |  4 +--
 .../cvl_iavf_rss_configure_test_plan.rst      |  2 +-
 test_plans/cvl_limit_value_test_test_plan.rst | 18 +++++-----
 test_plans/cvl_rss_configure_test_plan.rst    | 18 +++++-----
 .../cvl_switch_filter_pppoe_test_plan.rst     |  7 ++--
 test_plans/cvl_switch_filter_test_plan.rst    |  7 ++--
 17 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst b/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst
index 7d99f775..f5710532 100644
--- a/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst
+++ b/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst
@@ -213,7 +213,7 @@ Prerequisites
 
 5. Launch the testpmd to configuration queue of rx and tx number 16 in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd  -c 0xff -n 4 -a 0000:18:01.0 -- -i --rxq=16 --txq=16
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0xff -n 4 -a 0000:18:01.0 -- -i --rxq=16 --txq=16
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
diff --git a/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst b/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst
index 30977694..5c3e7c4d 100644
--- a/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst
+++ b/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst
@@ -1413,7 +1413,7 @@ Subcase: MAC_IPV4_GTPU_IPV4_UDP/TCP
 -----------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1433,7 +1433,7 @@ Subcase: MAC_IPV4_GTPU_EH_IPV6_UDP/TCP
 --------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1453,7 +1453,7 @@ Subcase: MAC_IPV6_GTPU_IPV4_UDP/TCP
 -----------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1473,7 +1473,7 @@ Subcase: MAC_IPV6_GTPU_EH_IPV6_UDP/TCP
 --------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1495,7 +1495,7 @@ symmetric cases
 
 start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 all the test cases run the same test steps as below:
 
diff --git a/test_plans/cvl_advanced_rss_gtpu_test_plan.rst b/test_plans/cvl_advanced_rss_gtpu_test_plan.rst
index db406413..96dad583 100644
--- a/test_plans/cvl_advanced_rss_gtpu_test_plan.rst
+++ b/test_plans/cvl_advanced_rss_gtpu_test_plan.rst
@@ -193,7 +193,7 @@ Prerequisites
 
 4. Launch the testpmd to configuration queue of rx and tx number 64 in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -1554,7 +1554,7 @@ default pattern supported case
 ==============================
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. send packets with switched l3 address of each packet type in the list:
 
@@ -1747,7 +1747,7 @@ Subcase: MAC_IPV4_GTPU_IPV4_UDP/TCP
 -----------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1767,7 +1767,7 @@ Subcase: MAC_IPV4_GTPU_EH_IPV6_UDP/TCP
 --------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1787,7 +1787,7 @@ Subcase: MAC_IPV6_GTPU_IPV4_UDP/TCP
 -----------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1807,7 +1807,7 @@ Subcase: MAC_IPV6_GTPU_EH_IPV6_UDP/TCP
 --------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create rules::
 
@@ -1829,7 +1829,7 @@ Subcase: IPV4_GTPU_IPV4/IPV4_GTPU_EH_IPV4
 -----------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create IPV4_GTPU_IPV4 rule::
 
@@ -1913,7 +1913,7 @@ Subcase: IPV4_GTPU_EH_IPV4 with/without UL/DL
 ---------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create IPV4_GTPU_DL_IPV4 rule::
 
@@ -1968,7 +1968,7 @@ Subcase: IPV4_GTPU_EH_IPV4 without/with UL/DL
 ---------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create IPV4_GTPU_EH_IPV4 rule::
 
@@ -2025,7 +2025,7 @@ Subcase: IPV4_GTPU_EH_IPV4 and IPV4_GTPU_EH_IPV4_UDP/TCP
 --------------------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. send packets with different inner UDP/TCP port::
 
@@ -2090,7 +2090,7 @@ Subcase: IPV6_GTPU_EH_IPV6 and IPV6_GTPU_EH_IPV6_UDP/TCP
 --------------------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. send packets with different inner UDP/TCP port::
 
@@ -2151,7 +2151,7 @@ Subcase: IPV4_GTPU_EH_IPV6 and IPV4_GTPU_EH_IPV6_UDP/TCP without UL/DL
 ----------------------------------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. send packets with different inner UDP/TCP port::
 
@@ -2192,7 +2192,7 @@ Subcase: IPV6_GTPU_IPV4 and IPV6_GTPU_IPV4_UDP/TCP
 --------------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. send packets with different inner UDP/TCP port::
 
@@ -2505,7 +2505,7 @@ Subcase: add/delete IPV4_GTPU_UL_IPV4_TCP rules
 -----------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create/delete IPV4_GTPU_UL_IPV4_TCP rule 100 times::
 
@@ -2531,7 +2531,7 @@ Subcase: add/delete IPV4_GTPU_DL_IPV4 rules
 -------------------------------------------
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 2. create/delete IPV4_GTPU_DL_IPV4 rule 100 times::
 
@@ -2557,7 +2557,7 @@ symmetric cases
 
 start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
 all the test cases run the same test steps as below:
 
@@ -3014,7 +3014,7 @@ rss function when disable rss
 =============================
 1. start testpmd without disable rss::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
 
 2. create a IPV4_GTPU_EH_IPV4 rule::
 
diff --git a/test_plans/cvl_advanced_rss_pppoe_test_plan.rst b/test_plans/cvl_advanced_rss_pppoe_test_plan.rst
index 829a94d2..c3f6ccad 100644
--- a/test_plans/cvl_advanced_rss_pppoe_test_plan.rst
+++ b/test_plans/cvl_advanced_rss_pppoe_test_plan.rst
@@ -125,7 +125,7 @@ Prerequisites
 
 5. Launch the testpmd in DUT for cases with toeplitz hash function::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16 --disable-rss
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16 --disable-rss
      testpmd> port config 0 rss-hash-key ipv4 1b9d58a4b961d9cd1c56ad1621c3ad51632c16a5d16c21c3513d132c135d132c13ad1531c23a51d6ac49879c499d798a7d949c8a
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -133,7 +133,7 @@ Prerequisites
 
    Launch testpmd for cases with symmetric_toeplitz and simple_xor hash function::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16
 
 6. on tester side, copy the layer python file to /root::
 
diff --git a/test_plans/cvl_advanced_rss_test_plan.rst b/test_plans/cvl_advanced_rss_test_plan.rst
index 8dbb8fc6..a2786ca0 100644
--- a/test_plans/cvl_advanced_rss_test_plan.rst
+++ b/test_plans/cvl_advanced_rss_test_plan.rst
@@ -312,11 +312,11 @@ Prerequisites
 
 4. Launch the testpmd to configuration queue of rx and tx number 64 in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --port-topology=loop
 
    or disable rss in command line::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0xff -n 4 -- -i --rxq=64 --txq=64 --disable-rss --port-topology=loop
     testpmd>set fwd rxonly
     testpmd>set verbose 1
     testpmd>rx_vxlan_port add 4789 0
diff --git a/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst b/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
index bc2db466..ca22efda 100644
--- a/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
+++ b/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
@@ -116,7 +116,7 @@ Prerequisites
 
 5. Launch the testpmd in DUT for cases with toeplitz hash function::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16 --disable-rss
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16 --disable-rss
      testpmd> port config 0 rss-hash-key ipv4 1b9d58a4b961d9cd1c56ad1621c3ad51632c16a5d16c21c3513d132c135d132c13ad1531c23a51d6ac49879c499d798a7d949c8a
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -124,7 +124,7 @@ Prerequisites
 
    Launch testpmd for cases with symmetric_toeplitz and simple_xor hash function::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 -- -i --rxq=16 --txq=16
 
 6. on tester side, copy the layer python file to /root::
 
diff --git a/test_plans/cvl_dcf_acl_filter_test_plan.rst b/test_plans/cvl_dcf_acl_filter_test_plan.rst
index c74dcb68..27a0e332 100644
--- a/test_plans/cvl_dcf_acl_filter_test_plan.rst
+++ b/test_plans/cvl_dcf_acl_filter_test_plan.rst
@@ -63,7 +63,8 @@ Prerequisites
 
 4. Compile DPDK::
 
-    make -j install T=x86_64-native-linuxapp-gcc
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc
 
 5. Get the pci device id of DUT, for example::
 
diff --git a/test_plans/cvl_dcf_date_path_test_plan.rst b/test_plans/cvl_dcf_date_path_test_plan.rst
index a5f8bdfc..c6f8014b 100755
--- a/test_plans/cvl_dcf_date_path_test_plan.rst
+++ b/test_plans/cvl_dcf_date_path_test_plan.rst
@@ -17,7 +17,7 @@ Set a VF as trust ::
 Launch dpdk on the VF, request DCF mode ::
 
     ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
-    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -a 18:01.0,cap=dcf --file-prefix=vf -- -i
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 6-10 -n 4 -a 18:01.0,cap=dcf --file-prefix=vf -- -i
 
 
 Test Case: Launch DCF and do macfwd
diff --git a/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst b/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst
index bd039ea6..5004b1e6 100644
--- a/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst
+++ b/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst
@@ -133,7 +133,8 @@ Prerequisites
 
 4. Compile DPDK::
 
-     make -j install T=x86_64-native-linuxapp-gcc
+     CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+     ninja -C x86_64-native-linuxapp-gcc
 
 5. Get the pci device id of DUT, for example::
 
diff --git a/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst b/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst
index d781f737..a00687c8 100644
--- a/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst
@@ -171,8 +171,8 @@ Prerequisites
 
 4. Compile DPDK::
 
-     make -j install T=x86_64-native-linuxapp-gcc
-
+     CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+     ninja -C x86_64-native-linuxapp-gcc
 5. Get the pci device id of DUT, for example::
 
      ./usertools/dpdk-devbind.py -s
@@ -201,7 +201,7 @@ Prerequisites
 
 9. Launch dpdk on VF0 and VF1, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
      testpmd> set portlist 1
      testpmd> set fwd rxonly
      testpmd> set verbose 1
diff --git a/test_plans/cvl_dcf_switch_filter_test_plan.rst b/test_plans/cvl_dcf_switch_filter_test_plan.rst
index 76857e4e..dda27740 100644
--- a/test_plans/cvl_dcf_switch_filter_test_plan.rst
+++ b/test_plans/cvl_dcf_switch_filter_test_plan.rst
@@ -201,7 +201,9 @@ Prerequisites
 
 4. Compile DPDK::
 
-     make -j install T=x86_64-native-linuxapp-gcc
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc
+
 
 5. Get the pci device id of DUT, for example::
 
@@ -231,7 +233,7 @@ Prerequisites
 
 9. Launch dpdk on VF0 and VF1, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
      testpmd> set portlist 1
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -2392,7 +2394,7 @@ Subcase 1: add existing rules but with different vfs
 
 1. Launch dpdk on VF0, VF1 and VF2, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
      testpmd> set portlist 1,2
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -2454,7 +2456,7 @@ Subcase 3: add two rules with one rule's input set included in the other
 
 1. Launch dpdk on VF0, VF1 and VF2, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
      testpmd> set portlist 1,2
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -2617,7 +2619,7 @@ are dropped.
 
 1. Launch dpdk on VF0, VF1 and VF2, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -a 0000:18:01.2 -- -i
      testpmd> set portlist 1,2
      testpmd> set fwd mac
      testpmd> set verbose 1
@@ -2688,7 +2690,7 @@ This case is designed based on 4*25G NIC.
 
 6. launch dpdk on VF0, and request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -- -i
 
 7. set a switch rule to each VF from DCF, totally 63 rules::
 
diff --git a/test_plans/cvl_fdir_test_plan.rst b/test_plans/cvl_fdir_test_plan.rst
index b5052578..60e16aa8 100644
--- a/test_plans/cvl_fdir_test_plan.rst
+++ b/test_plans/cvl_fdir_test_plan.rst
@@ -145,7 +145,7 @@ Prerequisites
 
 5. Launch the app ``testpmd`` with the following arguments::
 
-    ./testpmd -c 0xff -n 6 -a 86:00.0 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
+    ./dpdk-testpmd -c 0xff -n 6 -a 86:00.0 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
     testpmd> set fwd rxonly
     testpmd> set verbose 1
 
@@ -156,7 +156,7 @@ Prerequisites
 
    Notes: if need two ports environment, launch ``testpmd`` with the following arguments::
 
-    ./testpmd -c 0xff -n 6 -a 86:00.0 -a 86:00.1 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
+    ./dpdk-testpmd -c 0xff -n 6 -a 86:00.0 -a 86:00.1 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
 
 Default parameters
 ------------------
diff --git a/test_plans/cvl_iavf_rss_configure_test_plan.rst b/test_plans/cvl_iavf_rss_configure_test_plan.rst
index 9766c767..ecce0fe8 100755
--- a/test_plans/cvl_iavf_rss_configure_test_plan.rst
+++ b/test_plans/cvl_iavf_rss_configure_test_plan.rst
@@ -69,7 +69,7 @@ Prerequisites
 
 5. launch testpmd::
 
-    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -- -i --rxq=16 --txq=16
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -- -i --rxq=16 --txq=16
     testpmd>set fwd rxonly
     testpmd>set verbose 1
     testpmd> start
diff --git a/test_plans/cvl_limit_value_test_test_plan.rst b/test_plans/cvl_limit_value_test_test_plan.rst
index 160b126e..84e650d5 100644
--- a/test_plans/cvl_limit_value_test_test_plan.rst
+++ b/test_plans/cvl_limit_value_test_test_plan.rst
@@ -91,7 +91,7 @@ Prerequisites
 
 5. Launch the app ``testpmd`` with the following arguments::
 
-    ./testpmd -c 0xff -n 6 -a 86:01.0 -a 86:01.1 --file-prefix=vf -- -i --rxq=16 --txq=16
+    ./dpdk-testpmd -c 0xff -n 6 -a 86:01.0 -a 86:01.1 --file-prefix=vf -- -i --rxq=16 --txq=16
     testpmd> set fwd rxonly
     testpmd> set verbose 1
 
@@ -159,7 +159,7 @@ if 2 vfs generated by 2 pf port, each vf can create 14336 rules at most.
 
 1. start testpmd on vf00::
 
-    ./testpmd -c 0xf -n 6 -a 86:01.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
+    ./dpdk-testpmd -c 0xf -n 6 -a 86:01.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
 
    create 1 rule on vf00::
 
@@ -169,7 +169,7 @@ if 2 vfs generated by 2 pf port, each vf can create 14336 rules at most.
 
 2. start testpmd on vf10::
 
-    ./testpmd -c 0xf0 -n 6 -a 86:0a.0 --file-prefix=vf10 -- -i --rxq=4 --txq=4
+    ./dpdk-testpmd -c 0xf0 -n 6 -a 86:0a.0 --file-prefix=vf10 -- -i --rxq=4 --txq=4
 
    create 14336 rules on vf10::
 
@@ -218,7 +218,7 @@ this card can create (2048 + 14336)*2=32768 rules.
 
 2. start testpmd on vf00::
 
-    ./testpmd -c 0xf -n 6 -a 86:01.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
+    ./dpdk-testpmd -c 0xf -n 6 -a 86:01.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
 
    create 1 rule on vf00::
 
@@ -228,7 +228,7 @@ this card can create (2048 + 14336)*2=32768 rules.
 
 2. start testpmd on vf10::
 
-    ./testpmd -c 0xf0 -n 6 -a 86:0a.0 --file-prefix=vf10 -- -i --rxq=4 --txq=4
+    ./dpdk-testpmd -c 0xf0 -n 6 -a 86:0a.0 --file-prefix=vf10 -- -i --rxq=4 --txq=4
 
    create 14335 rules on vf10::
 
@@ -289,7 +289,7 @@ so if create 16384 rules on pf1,check failed to create rule on vf00 and vf10(vf0
 
 3. start testpmd on vf00 and vf10::
 
-    ./testpmd -c 0xf -n 6 -a 86:01.0 -a 86:11.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
+    ./dpdk-testpmd -c 0xf -n 6 -a 86:01.0 -a 86:11.0 --file-prefix=vf00 -- -i --rxq=4 --txq=4
 
    create 1 rule on vf00::
 
@@ -435,7 +435,7 @@ Prerequisites
 
 5. Launch the app ``testpmd`` with the following arguments::
 
-    ./testpmd -c 0xff -n 6 -a 86:00.0 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
+    ./dpdk-testpmd -c 0xff -n 6 -a 86:00.0 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
     testpmd> set fwd rxonly
     testpmd> set verbose 1
 
@@ -446,7 +446,7 @@ Prerequisites
 
    Notes: if need two ports environment, launch ``testpmd`` with the following arguments::
 
-    ./testpmd -c 0xff -n 6 -a 86:00.0 -a 86:00.1 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
+    ./dpdk-testpmd -c 0xff -n 6 -a 86:00.0 -a 86:00.1 --log-level="ice,7" -- -i --portmask=0xff --rxq=64 --txq=64 --port-topology=loop
 
 Test case: add/delete rules
 ============================
@@ -529,7 +529,7 @@ Prerequisites
 
 8. Launch dpdk on VF0 and VF1, and VF0 request DCF mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:01.0,cap=dcf -a 0000:18:01.1 -- -i
      testpmd> set portlist 1
      testpmd> set fwd rxonly
      testpmd> set verbose 1
diff --git a/test_plans/cvl_rss_configure_test_plan.rst b/test_plans/cvl_rss_configure_test_plan.rst
index eaf15bd0..fef73728 100644
--- a/test_plans/cvl_rss_configure_test_plan.rst
+++ b/test_plans/cvl_rss_configure_test_plan.rst
@@ -81,7 +81,7 @@ Test Case: test_command_line_option_rss_ip
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --rss-ip
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --rss-ip
     testpmd>set fwd rxonly
     testpmd>set verbose 1
     testpmd>start
@@ -201,7 +201,7 @@ Test Case: test_command_line_option_rss_udp
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --rss-udp
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --rss-udp
     testpmd>set fwd rxonly
     testpmd>set verbose 1
     testpmd>start
@@ -265,7 +265,7 @@ Test Case: test_command_line_option_disable-rss
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --disable-rss
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10 --disable-rss
     testpmd>set fwd rxonly
     testpmd>set verbose 1
     testpmd>start
@@ -287,7 +287,7 @@ Test Case: test_RSS_configure_to_ip
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -411,7 +411,7 @@ Test Case: test_RSS_configure_to_udp
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -529,7 +529,7 @@ Test Case: test_RSS_configure_to_tcp
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -647,7 +647,7 @@ Test Case: test_RSS_configure_to_sctp
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -761,7 +761,7 @@ Test Case: test_RSS_configure_to_all
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
@@ -863,7 +863,7 @@ Test Case: test_RSS_configure_to_default
 
 1. Launch the testpmd in DUT::
 
-    testpmd>./x86_64-native-linuxapp-gcc/app/testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
+    testpmd>./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xff -n 4 -- -i --rxq=10 --txq=10
     testpmd>set fwd rxonly
     testpmd>set verbose 1
 
diff --git a/test_plans/cvl_switch_filter_pppoe_test_plan.rst b/test_plans/cvl_switch_filter_pppoe_test_plan.rst
index b9e04ea6..7485c45d 100644
--- a/test_plans/cvl_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/cvl_switch_filter_pppoe_test_plan.rst
@@ -195,7 +195,8 @@ Prerequisites
 
 4. Compile DPDK::
 
-     make -j install T=x86_64-native-linuxapp-gcc
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc
 
 5. Bind pf to dpdk driver::
 
@@ -203,7 +204,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
      testpmd> port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -217,7 +218,7 @@ Prerequisites
 
    Launch dpdk in pipeline mode with the following testpmd command line::
 
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0,pipeline-mode-support=1 --log-level="ice,8" -- -i --txq=16 --rxq=16
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0,pipeline-mode-support=1 --log-level="ice,8" -- -i --txq=16 --rxq=16
 
 Test case: Ethertype filter
 ===========================
diff --git a/test_plans/cvl_switch_filter_test_plan.rst b/test_plans/cvl_switch_filter_test_plan.rst
index 9a53e9cb..770af996 100644
--- a/test_plans/cvl_switch_filter_test_plan.rst
+++ b/test_plans/cvl_switch_filter_test_plan.rst
@@ -173,7 +173,8 @@ Prerequisites
 
 4. Compile DPDK::
 
-     make -j install T=x86_64-native-linuxapp-gcc
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc
 
 5. Bind pf to dpdk driver::
 
@@ -181,7 +182,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
+     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
      testpmd> port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd
      testpmd> set fwd rxonly
      testpmd> set verbose 1
@@ -195,7 +196,7 @@ Prerequisites
 
    Launch dpdk in pipeline mode with the following testpmd command line::
 
-      ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0,pipeline-mode-support=1 --log-level="ice,8" -- -i --txq=16 --rxq=16
+      ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -a 0000:18:00.0,pipeline-mode-support=1 --log-level="ice,8" -- -i --txq=16 --rxq=16
 
 Test case: VXLAN non-pipeline mode
 ==================================
-- 
2.17.1

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

[Tu, Lijuan]

> -----Original Message-----
> From: Zhimin Huang <zhiminx.huang@intel.com>
> Sent: 2021年12月20日 18:46
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1] test_plans/cvl_*:modify test plan to adapt meson
> build
> 
> modify dpdk app/example name and take build type to meson.
> for example:
> 1.testpmd to dpdk-testpmd.
> 2.make install to meson build.
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>

Applied