diff options
author | Jiajun Xu <jiajun.xu@intel.com> | 2011-01-13 09:46:14 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-14 08:09:26 -0800 |
commit | 2119274314f49678de78dc1c5aa2971676fa6774 (patch) | |
tree | 3ebf3b48d3a0e99930f7184dfe147c7259bd90f1 /scripts/qemuimage-tests/sanity | |
parent | 897530621fabf3c345c302050a5c21e16097a2ba (diff) | |
download | openembedded-core-2119274314f49678de78dc1c5aa2971676fa6774.tar.gz openembedded-core-2119274314f49678de78dc1c5aa2971676fa6774.tar.bz2 openembedded-core-2119274314f49678de78dc1c5aa2971676fa6774.tar.xz openembedded-core-2119274314f49678de78dc1c5aa2971676fa6774.zip |
qemuimagetest: Use the same image in sanity testing to fix the timeout issue on autobuilder
Fixes [BUGID #595]
Because of the QEMU booting slowness issue(see bug #646 and #618), autobuilder
may suffer a timeout issue when running sanity test. We introduce variable
SHARE_IMAGE here to fix the issue. It is by default set to 1. Poky will copy
latest built-out image and keep using it in sanity testing. If it is set to 0,
latest built-out image will be copied and tested for each case, which will take
much time.
Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
Diffstat (limited to 'scripts/qemuimage-tests/sanity')
-rwxr-xr-x | scripts/qemuimage-tests/sanity/compiler | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/connman | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/dmesg | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/rpm_query | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/scp | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/shutdown | 7 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/ssh | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/zypper_help | 2 | ||||
-rwxr-xr-x | scripts/qemuimage-tests/sanity/zypper_search | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler index 0290540e7..d3168a973 100755 --- a/scripts/qemuimage-tests/sanity/compiler +++ b/scripts/qemuimage-tests/sanity/compiler @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman index 8c5b7c5cf..6e19b81b1 100755 --- a/scripts/qemuimage-tests/sanity/connman +++ b/scripts/qemuimage-tests/sanity/connman @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg index 36813dcd4..d98d7aff8 100755 --- a/scripts/qemuimage-tests/sanity/dmesg +++ b/scripts/qemuimage-tests/sanity/dmesg @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query index 9962115d6..766390196 100755 --- a/scripts/qemuimage-tests/sanity/rpm_query +++ b/scripts/qemuimage-tests/sanity/rpm_query @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp index ce3489d66..ca1985792 100755 --- a/scripts/qemuimage-tests/sanity/scp +++ b/scripts/qemuimage-tests/sanity/scp @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 SPID=0 i=0 diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown index e36b4a983..dde03c9a1 100755 --- a/scripts/qemuimage-tests/sanity/shutdown +++ b/scripts/qemuimage-tests/sanity/shutdown @@ -13,7 +13,12 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +if [ $SHARE_IMAGE -eq 0 ]; then + TIMEOUT=200 +elif [ $SHARE_IMAGE -eq 1 ]; then + TIMEOUT=500 +fi + RET=1 i=0 diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh index 084530adf..e0ade72ca 100755 --- a/scripts/qemuimage-tests/sanity/ssh +++ b/scripts/qemuimage-tests/sanity/ssh @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help index e05250195..48e121c9e 100755 --- a/scripts/qemuimage-tests/sanity/zypper_help +++ b/scripts/qemuimage-tests/sanity/zypper_help @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search index b756db8fa..9ae69ebf1 100755 --- a/scripts/qemuimage-tests/sanity/zypper_search +++ b/scripts/qemuimage-tests/sanity/zypper_search @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=360 +TIMEOUT=200 RET=1 # Start qemu and check its network |