X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ftldk%2Ftldk_scripts%2Frun_tldk.sh;h=6a0311b9746ef67c7cf15e28caf85335e4e3b17e;hp=0f56f02dfc6a930742e8c14b7f1f0ad47ec471dc;hb=f67399101f4fa359de7f6e2b325be455d1438ee8;hpb=bf46bcd0db5a35ce49e3b55e567fc83be37abd32

diff --git a/tests/tldk/tldk_scripts/run_tldk.sh b/tests/tldk/tldk_scripts/run_tldk.sh
index 0f56f02dfc..6a0311b974 100755
--- a/tests/tldk/tldk_scripts/run_tldk.sh
+++ b/tests/tldk/tldk_scripts/run_tldk.sh
@@ -15,15 +15,31 @@ IPv6_addr=$7
 
 echo $IPv4_addr
 
-#kill the l4fwd
-sudo killall -9 l4fwd 2>/dev/null
-
-sleep 2
-
-pid=`pgrep l4fwd`
-if [ "$pid" != "" ]; then
-    echo "terminate the l4fwd failed!"
-    exit 1
+# Try to kill the l4fwd
+sudo pgrep l4fwd
+if [ $? -eq "0" ]; then
+    success=false
+    sudo pkill l4fwd
+    echo "RC = $?"
+    for attempt in {1..5}; do
+        echo "Checking if l4fwd is still alive, attempt nr ${attempt}"
+        sudo pgrep l4fwd
+        if [ $? -eq "1" ]; then
+            echo "l4fwd is dead"
+            success=true
+            break
+        fi
+        echo "l4fwd is still alive, waiting 1 second"
+        sleep 1
+    done
+    if [ "$success" = false ]; then
+        echo "The command sudo pkill l4fwd failed"
+        sudo pkill -9 l4fwd
+        echo "RC = $?"
+        exit 1
+    fi
+else
+    echo "l4fwd is not running"
 fi
 
 #mount the hugepages again
@@ -50,4 +66,6 @@ fi
 
 cd ${PWDDIR}
 
+ps -elf | grep l4fwd
+
 sleep 10