diff options
author | Jiajun Xu <jiajun.xu@intel.com> | 2011-01-06 12:01:31 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-06 10:06:32 +0000 |
commit | 601af9f8ead73e4c385162e820b877f18e5e6722 (patch) | |
tree | d2ce8fb4828db3799e4d1dd479073d94513ca178 | |
parent | d2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1 (diff) | |
download | poky-601af9f8ead73e4c385162e820b877f18e5e6722.tar.gz |
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>
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() | |||
420 | sleep 5 | 420 | sleep 5 |
421 | TARGET_IPADDR=`Test_Fetch_Target_IP $PID` | 421 | TARGET_IPADDR=`Test_Fetch_Target_IP $PID` |
422 | # If IP address is 0, means there is no qemu process found | 422 | # If IP address is 0, means there is no qemu process found |
423 | if [ ${TARGET_IPADDR} -eq 0 ]; then | 423 | if [ ${TARGET_IPADDR} == "0" ]; then |
424 | Test_Info "There is no qemu process or qemu ip address found, return failed" | 424 | Test_Info "There is no qemu process or qemu ip address found, return failed" |
425 | return $ret | 425 | return $ret |
426 | fi | 426 | 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 | |||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
9 | 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 | |||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
9 | 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 | |||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
9 | 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 | |||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
9 | 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 | |||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
9 | sanity connman | ||