[V1,2/5] test_plans/*: modify test plan to adapt meson build

Message ID 20220223134838.509099-3-yux.jiang@intel.com (mailing list archive)
State Superseded
Headers
Series test_plans/*: modify test plan to adapt meson build |

Commit Message

Yu Jiang Feb. 23, 2022, 1:48 p.m. UTC
  test_plans/*: modify test plan to adapt meson build,
including sw_hw_thash_consistence,telemetry,vdev_primary_secondary,vf_packet_rxtx

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

Patch

diff --git a/test_plans/sw_hw_thash_consistence_test_plan.rst b/test_plans/sw_hw_thash_consistence_test_plan.rst
index a263b3d2..979b21fc 100644
--- a/test_plans/sw_hw_thash_consistence_test_plan.rst
+++ b/test_plans/sw_hw_thash_consistence_test_plan.rst
@@ -44,13 +44,14 @@  First apply a DPDK patch, which provide an example for calling rte_hash ::
 
 Compile the example ::
 
-    export RTE_SDK=<dpdk>
-    cd <dpdk>/examples/thash
-    make
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
+    meson configure -Dexamples=thash <build_target>
+    ninja -C <build_target>
 
 Run thash example, which supported format: thash_test TYPE(ipv4|ipv4-udp|ipv4-tcp) IP_DST IP_SRC PORT_DST PORT_SRC ::
 
-    ./build/thash_test ipv6 ::22 ::11 1234 4321
+    ./<build_target>/examples/dpdk-thash_test ipv6 ::22 ::11 1234 4321
     # The output
     ipv6
     ::22
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::