From f6cf39c515f503f367df441924fd16967d518539 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Fri, 3 Feb 2017 11:26:37 +0100 Subject: CSIT-517: DPDK initialization and teardown Change-Id: Iff42549e3be610c88b7a7d5518ef2cbb88c75ed2 Signed-off-by: Tibor Frank --- dpdk-tests/dpdk_scripts/cleanup_dpdk.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'dpdk-tests/dpdk_scripts/cleanup_dpdk.sh') diff --git a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh index 8ab9c6f676..915d383bfa 100755 --- a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh +++ b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh @@ -12,15 +12,28 @@ port2_driver=$3 port2_pci=$4 #kill the dpdk application -sudo pkill testpmd -sudo pkill l2fwd -sudo pkill l3fwd +sudo pgrep testpmd +if [ $? -eq "0" ]; then + success=false + sudo pkill testpmd + for attempt in {1..5}; do + sudo pgrep testpmd + if [ $? -eq "1" ]; then + success=true + break + fi + sleep 1 + done + if [ ${success} -eq false ]; then + echo "The command sudo pkill testpmd failed" + exit 1 + fi +fi + sudo rm -f ${TESTPMD_PID} sudo rm -f /dev/hugepages/* cat ${TESTPMD_LOG} -sleep 2 - cd ${ROOTDIR}/dpdk-16.07/ ./tools/dpdk-devbind.py -b ${port1_driver} ${port1_pci} ./tools/dpdk-devbind.py -b ${port2_driver} ${port2_pci} -- cgit 1.2.3-korg