From 10d67066f2699e37a8c50e435a1765c8f08d9d9e Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Wed, 22 Jan 2020 16:38:39 +0100
Subject: FIX: Detection if l2fwd/l3fwd is up/down

Change-Id: Ide5de222e8314a0ea0be59f9a478f8d59147f722
Signed-off-by: Jan Gelety <jgelety@cisco.com>
(cherry picked from commit b968e370fe2737233f138ffd67a5bff75a6de091)
---
 tests/dpdk/dpdk_scripts/cleanup_dpdk.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'tests/dpdk/dpdk_scripts/cleanup_dpdk.sh')

diff --git a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
index a8624a8321..a97b4ba121 100755
--- a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
@@ -20,7 +20,7 @@ if [ $? -eq "0" ]; then
     success=false
     sudo pkill testpmd
     echo "RC = $?"
-    for attempt in {1..5}; do
+    for attempt in {1..60}; do
         echo "Checking if testpmd is still alive, attempt nr ${attempt}"
         sudo pgrep testpmd
         if [ $? -eq "1" ]; then
@@ -47,7 +47,7 @@ if [ $? -eq "0" ]; then
     success=false
     sudo pkill l3fwd
     echo "RC = $?"
-    for attempt in {1..5}; do
+    for attempt in {1..60}; do
         echo "Checking if l3fwd is still alive, attempt nr ${attempt}"
         sudo pgrep l3fwd
         if [ $? -eq "1" ]; then
@@ -83,8 +83,4 @@ sleep 2
 if1_name=`./usertools/dpdk-devbind.py --s | grep "${port1_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
 if2_name=`./usertools/dpdk-devbind.py --s | grep "${port2_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
 
-# Remove igb_uio driver
-rmmod igb_uio || \
-    { echo "Removing igb_uio failed"; exit 1; }
-
 cd ${PWDDIR}
-- 
cgit 1.2.3-korg