devtools: restore null test

[dpdk.git] / devtools / test-null.sh

diff --git a/devtools/test-null.sh b/devtools/test-null.sh
index 61879e3..73bbded 100755 (executable)
--- 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