summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiajun Xu <jiajun.xu@intel.com>2011-01-06 12:01:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-06 10:06:32 +0000
commit601af9f8ead73e4c385162e820b877f18e5e6722 (patch)
treed2ce8fb4828db3799e4d1dd479073d94513ca178
parentd2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1 (diff)
downloadopenembedded-core-contrib-601af9f8ead73e4c385162e820b877f18e5e6722.tar.gz
openembedded-core-contrib-601af9f8ead73e4c385162e820b877f18e5e6722.tar.bz2
openembedded-core-contrib-601af9f8ead73e4c385162e820b877f18e5e6722.zip
qemuimagetest: Remove connman test for lsb image and fix one warning in Test_Create_Qemu
There is no connman in LSB image. So we need to remove connman test from it. And when we check if ip address fetched by Test_Fetch_Target_IP is valid, we should use "==" operator for string comparison. Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
-rw-r--r--scripts/qemuimage-testlib2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb1
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb1
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb1
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb1
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb1
6 files changed, 1 insertions, 6 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 713a47434d..e2c2d244c5 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -420,7 +420,7 @@ Test_Create_Qemu()
sleep 5
TARGET_IPADDR=`Test_Fetch_Target_IP $PID`
# If IP address is 0, means there is no qemu process found
- if [ ${TARGET_IPADDR} -eq 0 ]; then
+ if [ ${TARGET_IPADDR} == "0" ]; then
Test_Info "There is no qemu process or qemu ip address found, return failed"
return $ret
fi
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
index 7b949a854c..32d2bd144b 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
sanity zypper_help
sanity zypper_search
sanity rpm_query
-sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
index 7b949a854c..32d2bd144b 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
sanity zypper_help
sanity zypper_search
sanity rpm_query
-sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
index 7b949a854c..32d2bd144b 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
sanity zypper_help
sanity zypper_search
sanity rpm_query
-sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
index 7b949a854c..32d2bd144b 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
sanity zypper_help
sanity zypper_search
sanity rpm_query
-sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
index 7b949a854c..32d2bd144b 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
@@ -6,4 +6,3 @@ sanity shutdown
sanity zypper_help
sanity zypper_search
sanity rpm_query
-sanity connman