summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-tests/sanity
diff options
context:
space:
mode:
authorJiajun Xu <jiajun.xu@intel.com>2011-01-19 00:22:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:36:57 +0000
commit3e052919c9307ba73a1db0f705b7dc1a677cb80f (patch)
tree14861629035fb78eaae19645801f49a608536ecf /scripts/qemuimage-tests/sanity
parent50b208612945c638e3f4965ebf90ade4aac5b636 (diff)
downloadpoky-3e052919c9307ba73a1db0f705b7dc1a677cb80f.tar.gz
qemuimagetest: Use same image during sanity testing instead of copying a new image for each case
To reduce the time on sanity testing, we remove variable SHARE_IMAGE and use a new variable TEST_SERIALIZE in local.conf. It is by default set to 1. Poky will copy and boot the to-be tested image for only once. It will not remove or kill the image and test cases will be serialized executed against the same image. If it is set to 0, image is always be copied for each cases, which takes much time. I had a experiment that latest qemuppc sato only takes 7 minutes to finish 9 sanity test cases, which takes more than 20 minutes before. I also removed sanity case "boot" from sato/sdk/lsb because the other cases for these targets already cover the check point of "boot". Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
Diffstat (limited to 'scripts/qemuimage-tests/sanity')
-rwxr-xr-xscripts/qemuimage-tests/sanity/compiler2
-rwxr-xr-xscripts/qemuimage-tests/sanity/connman2
-rwxr-xr-xscripts/qemuimage-tests/sanity/dmesg2
-rwxr-xr-xscripts/qemuimage-tests/sanity/rpm_query2
-rwxr-xr-xscripts/qemuimage-tests/sanity/scp2
-rwxr-xr-xscripts/qemuimage-tests/sanity/shutdown11
-rwxr-xr-xscripts/qemuimage-tests/sanity/ssh2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_help2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_search2
9 files changed, 14 insertions, 13 deletions
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
index d3168a973c..29dbfd9bb9 100755
--- a/scripts/qemuimage-tests/sanity/compiler
+++ b/scripts/qemuimage-tests/sanity/compiler
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman
index 6e19b81b16..fca6a27845 100755
--- a/scripts/qemuimage-tests/sanity/connman
+++ b/scripts/qemuimage-tests/sanity/connman
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg
index d98d7aff84..5ed31b735f 100755
--- a/scripts/qemuimage-tests/sanity/dmesg
+++ b/scripts/qemuimage-tests/sanity/dmesg
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query
index 7663901962..08017ffbe6 100755
--- a/scripts/qemuimage-tests/sanity/rpm_query
+++ b/scripts/qemuimage-tests/sanity/rpm_query
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp
index ca19857928..c72cdc9d65 100755
--- a/scripts/qemuimage-tests/sanity/scp
+++ b/scripts/qemuimage-tests/sanity/scp
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16SPID=0 16SPID=0
17i=0 17i=0
diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown
index dde03c9a10..bc08cf0fdc 100755
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -13,11 +13,7 @@
13 13
14. $POKYBASE/scripts/qemuimage-testlib 14. $POKYBASE/scripts/qemuimage-testlib
15 15
16if [ $SHARE_IMAGE -eq 0 ]; then 16TIMEOUT=400
17 TIMEOUT=200
18elif [ $SHARE_IMAGE -eq 1 ]; then
19 TIMEOUT=500
20fi
21 17
22RET=1 18RET=1
23i=0 19i=0
@@ -66,6 +62,11 @@ fi
66if [ ${RET} -eq 0 ]; then 62if [ ${RET} -eq 0 ]; then
67 Test_Info "Shutdown Test PASS" 63 Test_Info "Shutdown Test PASS"
68 Test_Print_Result "shutdown" 0 64 Test_Print_Result "shutdown" 0
65
66 # Remove TARGET_IPSAVE since no existing qemu running now
67 if [ -e ${TARGET_IPSAVE} ]; then
68 rm -rf ${TARGET_IPSAVE}
69 fi
69 exit 0 70 exit 0
70else 71else
71 Test_Info "Shutdown Test FAIL" 72 Test_Info "Shutdown Test FAIL"
diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh
index e0ade72ca3..2a0e934392 100755
--- a/scripts/qemuimage-tests/sanity/ssh
+++ b/scripts/qemuimage-tests/sanity/ssh
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help
index 48e121c9e1..1ab6d2407f 100755
--- a/scripts/qemuimage-tests/sanity/zypper_help
+++ b/scripts/qemuimage-tests/sanity/zypper_help
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search
index 9ae69ebf1f..d6bcd27a34 100755
--- a/scripts/qemuimage-tests/sanity/zypper_search
+++ b/scripts/qemuimage-tests/sanity/zypper_search
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network