summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-tests
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-12-10 16:03:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:24:51 (GMT)
commitba08a8ccbf11542867b7dd0474599fccb0585b97 (patch)
treebb7424010dda8a55697bbfa1ccf5e63f14c6b832 /scripts/qemuimage-tests
parent2997a704fcf035b1f4d8517e6b7887d250cb2716 (diff)
downloadpoky-ba08a8ccbf11542867b7dd0474599fccb0585b97.tar.gz
Update sanity tests to use smart instead of zypper
(From OE-Core rev: c56d24b35d94fe2934ac7e1dc67422e6abc7539d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/qemuimage-tests')
-rwxr-xr-xscripts/qemuimage-tests/sanity/smart_help (renamed from scripts/qemuimage-tests/sanity/zypper_help)24
-rwxr-xr-xscripts/qemuimage-tests/sanity/smart_query (renamed from scripts/qemuimage-tests/sanity/zypper_search)24
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-sato4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk4
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-lsb4
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-sato4
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-sato4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-lsb4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-sato4
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk4
-rw-r--r--scripts/qemuimage-tests/tools/smart_test.sh45
-rw-r--r--scripts/qemuimage-tests/tools/zypper_test.sh45
19 files changed, 99 insertions, 99 deletions
diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/smart_help
index 94f82c4..0eeac26 100755
--- a/scripts/qemuimage-tests/sanity/zypper_help
+++ b/scripts/qemuimage-tests/sanity/smart_help
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2# Zypper Check Test Case for Sanity Test 2# Smart Check Test Case for Sanity Test
3# The case boot up the Qemu target with `runqemu qemuxxx`. 3# The case boot up the Qemu target with `runqemu qemuxxx`.
4# Then check if zypper command can work in target. 4# Then check if smart command can work in target.
5# 5#
6# Author: Jiajun Xu <jiajun.xu@intel.com> 6# Author: Jiajun Xu <jiajun.xu@intel.com>
7# 7#
@@ -26,13 +26,13 @@ else
26 RET=1 26 RET=1
27fi 27fi
28 28
29# Check if zypper help can work in target 29# Check if smart --help can work in target
30if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then 30if [ $RET -eq 0 -a -f $TOOLS/smart_test.sh ]; then
31 # Copy zypper_test.sh into target 31 # Copy smart_test.sh into target
32 Test_Target_Pre ${TARGET_IPADDR} $TOOLS/zypper_test.sh 32 Test_Target_Pre ${TARGET_IPADDR} $TOOLS/smart_test.sh
33 if [ $? -eq 0 ]; then 33 if [ $? -eq 0 ]; then
34 # Run zypper_test.sh to check if zypper help can work in target 34 # Run smart_test.sh to check if smart --help can work in target
35 Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/zypper_test.sh help" 35 Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/smart_test.sh --help"
36 RET=$? 36 RET=$?
37 else 37 else
38 RET=1 38 RET=1
@@ -40,13 +40,13 @@ if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
40fi 40fi
41 41
42if [ ${RET} -eq 0 ]; then 42if [ ${RET} -eq 0 ]; then
43 Test_Info "zypper help Test PASS" 43 Test_Info "smart --help Test PASS"
44 Test_Kill_Qemu 44 Test_Kill_Qemu
45 Test_Print_Result "zypper_help" 0 45 Test_Print_Result "smart_help" 0
46 exit 0 46 exit 0
47else 47else
48 Test_Info "zypper help FAIL, Pls. check above error log" 48 Test_Info "smart --help FAIL, Pls. check above error log"
49 Test_Kill_Qemu 49 Test_Kill_Qemu
50 Test_Print_Result "zypper_help" 1 50 Test_Print_Result "smart_help" 1
51 exit 1 51 exit 1
52fi 52fi
diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/smart_query
index e687ead..779ee63 100755
--- a/scripts/qemuimage-tests/sanity/zypper_search
+++ b/scripts/qemuimage-tests/sanity/smart_query
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2# Zypper Check Test Case for Sanity Test 2# Smart Check Test Case for Sanity Test
3# The case boot up the Qemu target with `runqemu qemuxxx`. 3# The case boot up the Qemu target with `runqemu qemuxxx`.
4# Then check if zypper command can work in target. 4# Then check if smart command can work in target.
5# 5#
6# Author: Jiajun Xu <jiajun.xu@intel.com> 6# Author: Jiajun Xu <jiajun.xu@intel.com>
7# 7#
@@ -26,13 +26,13 @@ else
26 RET=1 26 RET=1
27fi 27fi
28 28
29# Check if zypper search can work in target 29# Check if smart query can work in target
30if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then 30if [ $RET -eq 0 -a -f $TOOLS/smart_test.sh ]; then
31 # Copy zypper_test.sh into target 31 # Copy smart_test.sh into target
32 Test_Target_Pre ${TARGET_IPADDR} $TOOLS/zypper_test.sh 32 Test_Target_Pre ${TARGET_IPADDR} $TOOLS/smart_test.sh
33 if [ $? -eq 0 ]; then 33 if [ $? -eq 0 ]; then
34 # Run zypper_test.sh to check if zypper search can work in target 34 # Run smart_test.sh to check if smart query can work in target
35 Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/zypper_test.sh search avahi" 35 Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/smart_test.sh query avahi*"
36 RET=$? 36 RET=$?
37 else 37 else
38 RET=1 38 RET=1
@@ -40,13 +40,13 @@ if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
40fi 40fi
41 41
42if [ ${RET} -eq 0 ]; then 42if [ ${RET} -eq 0 ]; then
43 Test_Info "zypper search package avahi Test PASS" 43 Test_Info "smart query package avahi Test PASS"
44 Test_Kill_Qemu 44 Test_Kill_Qemu
45 Test_Print_Result "zypper_search" 0 45 Test_Print_Result "smart_query" 0
46 exit 0 46 exit 0
47else 47else
48 Test_Info "zypper search package avahi FAIL, Pls. check above error log" 48 Test_Info "smart query package avahi FAIL, Pls. check above error log"
49 Test_Kill_Qemu 49 Test_Kill_Qemu
50 Test_Print_Result "zypper_search" 1 50 Test_Print_Result "smart_query" 1
51 exit 1 51 exit 1
52fi 52fi
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
index 4fa6068..c0fff0e 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
@@ -1,7 +1,7 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity shutdown 7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
index 0e79703..1ddcab4 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity connman 7sanity connman
8sanity shutdown 8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
index 726842c..50d7ad0 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity compiler 7sanity compiler
8sanity connman 8sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
index 4fa6068..c0fff0e 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
@@ -1,7 +1,7 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity shutdown 7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
index 0e79703..1ddcab4 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity connman 7sanity connman
8sanity shutdown 8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
index 726842c..50d7ad0 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity compiler 7sanity compiler
8sanity connman 8sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
index 4fa6068..c0fff0e 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
@@ -1,7 +1,7 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity shutdown 7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
index 0e79703..1ddcab4 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity connman 7sanity connman
8sanity shutdown 8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
index 726842c..50d7ad0 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity compiler 7sanity compiler
8sanity connman 8sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
index 4fa6068..c0fff0e 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
@@ -1,7 +1,7 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity shutdown 7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
index 0e79703..1ddcab4 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity connman 7sanity connman
8sanity shutdown 8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
index 726842c..50d7ad0 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity compiler 7sanity compiler
8sanity connman 8sanity connman
diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
index 4fa6068..c0fff0e 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
@@ -1,7 +1,7 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity shutdown 7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
index 0e79703..1ddcab4 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity connman 7sanity connman
8sanity shutdown 8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
index 726842c..50d7ad0 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
@@ -1,8 +1,8 @@
1sanity ssh 1sanity ssh
2sanity scp 2sanity scp
3sanity dmesg 3sanity dmesg
4sanity zypper_help 4sanity smart_help
5sanity zypper_search 5sanity smart_query
6sanity rpm_query 6sanity rpm_query
7sanity compiler 7sanity compiler
8sanity connman 8sanity connman
diff --git a/scripts/qemuimage-tests/tools/smart_test.sh b/scripts/qemuimage-tests/tools/smart_test.sh
new file mode 100644
index 0000000..f278a25
--- /dev/null
+++ b/scripts/qemuimage-tests/tools/smart_test.sh
@@ -0,0 +1,45 @@
1#!/bin/bash
2# smart test script running in target
3#
4# Author: Jiajun Xu <jiajun.xu@intel.com>
5#
6# This file is licensed under the GNU General Public License,
7# Version 2.
8#
9
10Target_Info()
11{
12 echo -e "\tTARGET: $*"
13}
14
15Target_Err()
16{
17 echo -e "\tTARGET: smart command has issue when running, Pls. check the error log"
18 echo -e "\tTARGET: ##### Error Log #####"
19 $1
20 echo -e "\tTARGET: ##### End #####"
21}
22
23which smart
24if [ $? -ne 0 ]; then
25 Target_Info "No smart command found"
26 exit 1
27fi
28
29if [ smart > /dev/null 2>&1 ]; then
30 Target_Info "smart command run without problem"
31else
32 Target_Err smart
33 exit 1
34fi
35
36# run smart with specific command parsed to smart_test.sh
37smart $* > /dev/null 2>&1
38
39if [ $? -eq 0 ]; then
40 Target_Info "smart $* work without problem"
41 exit 0
42else
43 Target_Err "smart $*"
44 exit 1
45fi
diff --git a/scripts/qemuimage-tests/tools/zypper_test.sh b/scripts/qemuimage-tests/tools/zypper_test.sh
deleted file mode 100644
index 5e8e7aa..0000000
--- a/scripts/qemuimage-tests/tools/zypper_test.sh
+++ /dev/null
@@ -1,45 +0,0 @@
1#!/bin/bash
2# zypper test script running in target
3#
4# Author: Jiajun Xu <jiajun.xu@intel.com>
5#
6# This file is licensed under the GNU General Public License,
7# Version 2.
8#
9
10Target_Info()
11{
12 echo -e "\tTARGET: $*"
13}
14
15Target_Err()
16{
17 echo -e "\tTARGET: zypper command has issue when running, Pls. check the error log"
18 echo -e "\tTARGET: ##### Error Log #####"
19 $1
20 echo -e "\tTARGET: ##### End #####"
21}
22
23which zypper
24if [ $? -ne 0 ]; then
25 Target_Info "No zypper command found"
26 exit 1
27fi
28
29if [ zypper > /dev/null 2>&1 ]; then
30 Target_Info "zypper command run without problem"
31else
32 Target_Err zypper
33 exit 1
34fi
35
36# run zypper with specific command parsed to zypper_test.sh
37zypper $* > /dev/null 2>&1
38
39if [ $? -eq 0 ]; then
40 Target_Info "zypper $* work without problem"
41 exit 0
42else
43 Target_Err zypper $*
44 exit 1
45fi