summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-tests
diff options
context:
space:
mode:
authorJiajun Xu <jiajun.xu@intel.com>2011-01-13 01:46:14 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-01-14 16:09:26 (GMT)
commit2119274314f49678de78dc1c5aa2971676fa6774 (patch)
tree3ebf3b48d3a0e99930f7184dfe147c7259bd90f1 /scripts/qemuimage-tests
parent897530621fabf3c345c302050a5c21e16097a2ba (diff)
downloadpoky-2119274314f49678de78dc1c5aa2971676fa6774.tar.gz
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')
-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/shutdown7
-rwxr-xr-xscripts/qemuimage-tests/sanity/ssh2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_help2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_search2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk2
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb2
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-sato2
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-sato2
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk2
24 files changed, 29 insertions, 24 deletions
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
index 0290540..d3168a9 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=360 14TIMEOUT=200
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 8c5b7c5..6e19b81 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=360 14TIMEOUT=200
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 36813dc..d98d7af 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=360 14TIMEOUT=200
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 9962115..7663901 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=360 14TIMEOUT=200
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 ce3489d..ca19857 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=360 14TIMEOUT=200
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 e36b4a9..dde03c9 100755
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -13,7 +13,12 @@
13 13
14. $POKYBASE/scripts/qemuimage-testlib 14. $POKYBASE/scripts/qemuimage-testlib
15 15
16TIMEOUT=360 16if [ $SHARE_IMAGE -eq 0 ]; then
17 TIMEOUT=200
18elif [ $SHARE_IMAGE -eq 1 ]; then
19 TIMEOUT=500
20fi
21
17RET=1 22RET=1
18i=0 23i=0
19 24
diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh
index 084530a..e0ade72 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=360 14TIMEOUT=200
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 e052501..48e121c 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=360 14TIMEOUT=200
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 b756db8..9ae69eb 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=360 14TIMEOUT=200
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/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
index 32d2bd1..0eb1926 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
index 7b949a8..b60a89a 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
index 3a8b129..53c9ad5 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
index 32d2bd1..0eb1926 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
index 7b949a8..b60a89a 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
index 3a8b129..53c9ad5 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
index 32d2bd1..0eb1926 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
index 7b949a8..b60a89a 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
index 3a8b129..53c9ad5 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
index 32d2bd1..0eb1926 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
index 7b949a8..b60a89a 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
index 3a8b129..53c9ad5 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
index 32d2bd1..0eb1926 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
index 7b949a8..b60a89a 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
index 3a8b129..53c9ad5 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
@@ -1,8 +1,8 @@
1sanity shutdown
1sanity boot 2sanity boot
2sanity ssh 3sanity ssh
3sanity scp 4sanity scp
4sanity dmesg 5sanity dmesg
5sanity shutdown
6sanity zypper_help 6sanity zypper_help
7sanity zypper_search 7sanity zypper_search
8sanity rpm_query 8sanity rpm_query