summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/imagetest-qemu.bbclass22
-rw-r--r--meta/conf/local.conf.sample8
-rw-r--r--scripts/qemuimage-testlib7
-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
27 files changed, 63 insertions, 27 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index bcae10d61d..28bb218272 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -5,6 +5,7 @@ TEST_LOG ?= "${LOG_DIR}/qemuimagetests"
5TEST_RESULT ?= "${TEST_DIR}/result" 5TEST_RESULT ?= "${TEST_DIR}/result"
6TEST_TMP ?= "${TEST_DIR}/tmp" 6TEST_TMP ?= "${TEST_DIR}/tmp"
7TEST_SCEN ?= "sanity" 7TEST_SCEN ?= "sanity"
8SHARE_IMAGE ?= "1"
8 9
9python do_qemuimagetest() { 10python do_qemuimagetest() {
10 qemuimagetest_main(d) 11 qemuimagetest_main(d)
@@ -37,7 +38,7 @@ def qemuimagetest_main(d):
37 """funtion to run each case under scenario""" 38 """funtion to run each case under scenario"""
38 def runtest(scen, case, fulltestpath): 39 def runtest(scen, case, fulltestpath):
39 resultpath = bb.data.getVar('TEST_RESULT', d, 1) 40 resultpath = bb.data.getVar('TEST_RESULT', d, 1)
40 testpath = bb.data.getVar('TEST_DIR', d, 1) 41 tmppath = bb.data.getVar('TEST_TMP', d, 1)
41 42
42 """initialize log file for testcase""" 43 """initialize log file for testcase"""
43 logpath = bb.data.getVar('TEST_LOG', d, 1) 44 logpath = bb.data.getVar('TEST_LOG', d, 1)
@@ -45,10 +46,9 @@ def qemuimagetest_main(d):
45 caselog = os.path.join(logpath, "%s/log_%s.%s" % (scen, case, bb.data.getVar('DATETIME', d, 1))) 46 caselog = os.path.join(logpath, "%s/log_%s.%s" % (scen, case, bb.data.getVar('DATETIME', d, 1)))
46 os.system("touch %s" % caselog) 47 os.system("touch %s" % caselog)
47 48
48
49 """export TEST_TMP, TEST_RESULT, DEPLOY_DIR and QEMUARCH""" 49 """export TEST_TMP, TEST_RESULT, DEPLOY_DIR and QEMUARCH"""
50 os.environ["PATH"] = bb.data.getVar("PATH", d, True) 50 os.environ["PATH"] = bb.data.getVar("PATH", d, True)
51 os.environ["TEST_TMP"] = testpath 51 os.environ["TEST_TMP"] = tmppath
52 os.environ["TEST_RESULT"] = resultpath 52 os.environ["TEST_RESULT"] = resultpath
53 os.environ["DEPLOY_DIR"] = bb.data.getVar("DEPLOY_DIR", d, True) 53 os.environ["DEPLOY_DIR"] = bb.data.getVar("DEPLOY_DIR", d, True)
54 os.environ["QEMUARCH"] = machine 54 os.environ["QEMUARCH"] = machine
@@ -56,6 +56,7 @@ def qemuimagetest_main(d):
56 os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True) 56 os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True)
57 os.environ["POKYBASE"] = bb.data.getVar("POKYBASE", d, True) 57 os.environ["POKYBASE"] = bb.data.getVar("POKYBASE", d, True)
58 os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True) 58 os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True)
59 os.environ["SHARE_IMAGE"] = bb.data.getVar("SHARE_IMAGE", d, True)
59 60
60 """run Test Case""" 61 """run Test Case"""
61 bb.note("Run %s test in scenario %s" % (case, scen)) 62 bb.note("Run %s test in scenario %s" % (case, scen))
@@ -97,6 +98,18 @@ def qemuimagetest_main(d):
97 list.append((item, casefile, fulltestcase)) 98 list.append((item, casefile, fulltestcase))
98 return list 99 return list
99 100
101 """Clean tmp folder for testing"""
102 def clean_tmp():
103 tmppath = bb.data.getVar('TEST_TMP', d, 1)
104
105 if os.path.isdir(tmppath):
106 for f in os.listdir(tmppath):
107 tmpfile = os.path.join(tmppath, f)
108 os.remove(tmpfile)
109
110 """Before running testing, clean temp folder first"""
111 clean_tmp()
112
100 """check testcase folder and create test log folder""" 113 """check testcase folder and create test log folder"""
101 testpath = bb.data.getVar('TEST_DIR', d, 1) 114 testpath = bb.data.getVar('TEST_DIR', d, 1)
102 bb.utils.mkdirhier(testpath) 115 bb.utils.mkdirhier(testpath)
@@ -150,6 +163,9 @@ def qemuimagetest_main(d):
150 bb.note(line) 163 bb.note(line)
151 f.close() 164 f.close()
152 165
166 """Clean temp files for testing"""
167 clean_tmp()
168
153 if ret != 0: 169 if ret != 0:
154 raise bb.build.FuncFailed("Some testcases fail, pls. check test result and test log!!!") 170 raise bb.build.FuncFailed("Some testcases fail, pls. check test result and test log!!!")
155 171
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 9c58e6bc0c..cb0e54887f 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -156,6 +156,14 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
156# list them like following. 156# list them like following.
157#TEST_SCEN = "sanity bat sanity:boot" 157#TEST_SCEN = "sanity bat sanity:boot"
158 158
159#Because of the QEMU booting slowness issue(see bug #646 and #618), autobuilder
160#may suffer a timeout issue when running sanity test. We introduce variable
161#SHARE_IMAGE here to fix the issue. It is by default set to 1. Poky will copy
162#latest built-out image and keep using it in sanity testing. If it is set to 0,
163#latest built-out image will be copied and tested for each case, which will take
164#much time.
165#SHARE_IMAGE = "1"
166
159# Set GLIBC_GENERATE_LOCALES to the locales you wish to generate should you not 167# Set GLIBC_GENERATE_LOCALES to the locales you wish to generate should you not
160# wish to perform the time-consuming step of generating all LIBC locales. 168# wish to perform the time-consuming step of generating all LIBC locales.
161# NOTE: If removing en_US.UTF-8 you will also need to uncomment, and set 169# NOTE: If removing en_US.UTF-8 you will also need to uncomment, and set
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index e2c2d244c5..b9afcf5bb6 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -383,9 +383,16 @@ Test_Create_Qemu()
383 TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-test.ext3" 383 TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-test.ext3"
384 384
385 CP=`which cp` 385 CP=`which cp`
386
387 # When SHARE_IMAGE is set, we use the existing image under tmp folder
386 if [ -e "$TEST_ROOTFS_IMAGE" ]; then 388 if [ -e "$TEST_ROOTFS_IMAGE" ]; then
389 if [ ${SHARE_IMAGE} -eq 1 ]; then
390 ROOTFS_IMAGE="$TEST_ROOTFS_IMAGE"
391 TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-shared-test.ext3"
392 fi
387 rm -rf $TEST_ROOTFS_IMAGE 393 rm -rf $TEST_ROOTFS_IMAGE
388 fi 394 fi
395
389 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE 396 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE
390 397
391 if [ $? -ne 0 ]; then 398 if [ $? -ne 0 ]; then
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
index 0290540e71..d3168a973c 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 8c5b7c5cf6..6e19b81b16 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 36813dcd43..d98d7aff84 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 9962115d67..7663901962 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 ce3489d664..ca19857928 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 e36b4a983d..dde03c9a10 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 084530adfb..e0ade72ca3 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 e052501957..48e121c9e1 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 b756db8fa3..9ae69ebf1f 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 32d2bd144b..0eb1926cfd 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 7b949a854c..b60a89af51 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 3a8b1293bd..53c9ad591e 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 32d2bd144b..0eb1926cfd 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 7b949a854c..b60a89af51 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 3a8b1293bd..53c9ad591e 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 32d2bd144b..0eb1926cfd 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 7b949a854c..b60a89af51 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 3a8b1293bd..53c9ad591e 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 32d2bd144b..0eb1926cfd 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 7b949a854c..b60a89af51 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 3a8b1293bd..53c9ad591e 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 32d2bd144b..0eb1926cfd 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 7b949a854c..b60a89af51 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 3a8b1293bd..53c9ad591e 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