qemuimage-testlib: Fix IP address handling
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 19 Mar 2013 23:32:29 +0000 (23:32 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 19 Mar 2013 23:35:01 +0000 (23:35 +0000)
Remove some pointless code and also fix the return handling
for the function since it returns null, not 0 as the comments
would suggest.

(From OE-Core rev: 6b8d7767ff14345af29d7774b7e16e29c3f7fa8e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/qemuimage-testlib

index 5d74a0a..42c3004 100755 (executable)
@@ -337,8 +337,6 @@ Test_Fetch_Target_IP()
        local ip_addr=0
 
        # Check if $1 pid exists and contains ipaddr of target
-       ps -wwfp $opid | grep -oq "192\.168\.7\.[0-9]*::"
-
        ip_addr=`ps -wwfp $opid | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'`
 
        echo $ip_addr
@@ -430,8 +428,8 @@ Test_Create_Qemu()
 
        # Parse IP address of target from the qemu command line
        TARGET_IPADDR=`Test_Fetch_Target_IP $QEMUPID`
-       # If IP address is 0, means there is no qemu process found
-       if [ ${TARGET_IPADDR} == "0" ]; then
+       echo "Target IP is ${TARGET_IPADDR}"
+       if [ -z ${TARGET_IPADDR} ]; then
                Test_Info "There is no qemu process or qemu ip address found, return failed"
                return 1
        fi