summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas@monjalon.net>2019-07-30 19:34:13 +0200
committerThomas Monjalon <thomas@monjalon.net>2019-08-05 17:21:14 +0200
commit85fc9b2542aa13bb0e3838458795c8aaccb77541 (patch)
treeb4aec29b567161d87520494be46e39103558dbb4
parent8e3cb36d5bd358abafb7bd4ba5b518cf3f11fcaf (diff)
downloaddpdk-85fc9b2542aa13bb0e3838458795c8aaccb77541.zip
dpdk-85fc9b2542aa13bb0e3838458795c8aaccb77541.tar.gz
dpdk-85fc9b2542aa13bb0e3838458795c8aaccb77541.tar.xz
devtools: restore null test
This small testpmd test was not working for a long time because of several changes in EAL and mempool. The 3 main issues solved are: - Make --no-huge working by specifying an amount of memory to allocate in legacy mode, and disabling mlockall. - Load a mempool handler in shared library case. - Support meson Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
-rwxr-xr-xdevtools/test-null.sh20
1 files changed, 15 insertions, 5 deletions
diff --git a/devtools/test-null.sh b/devtools/test-null.sh
index 61879e3..73bbded 100755
--- a/devtools/test-null.sh
+++ b/devtools/test-null.sh
@@ -1,17 +1,27 @@
#! /bin/sh -e
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2015 6WIND S.A.
+# Copyright 2019 Mellanox Technologies, Ltd
# Run a quick testpmd forwarding with null PMD without hugepage
build=${1:-build}
coremask=${2:-3} # default using cores 0 and 1
-if grep -q SHARED_LIB=y $build/.config; then
- pmd='-d librte_pmd_null.so'
+testpmd=$build/app/dpdk-testpmd
+[ -f "$testpmd" ] || testpmd=$build/app/testpmd
+if [ ! -f "$testpmd" ] ; then
+ echo 'ERROR: testpmd cannot be found' >&2
+ exit 1
+fi
+
+if ldd $testpmd | grep -q librte_ ; then
+ libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
+else
+ libs=
fi
(sleep 1 && echo stop) |
-$build/app/testpmd -c $coremask -n 1 --no-huge \
- $pmd --vdev net_null1 --vdev net_null2 -- \
- --total-num-mbufs=2048 -ia
+$testpmd -c $coremask --no-huge -m 150 \
+ $libs --vdev net_null1 --vdev net_null2 -- \
+ --no-mlockall --total-num-mbufs=2048 -ia