9 files changed, 270 insertions, 4 deletions

diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
new file mode 100755
index 0000000000..29dbfd9bb9
--- /dev/null
+++ b/scripts/qemuimage-tests/sanity/compiler
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Compiler Test Case for Sanity Test
+# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# Then check if gcc/g++/make command can work in target.
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+. $POKYBASE/scripts/qemuimage-testlib
+
+TIMEOUT=400
+RET=1
+
+# Start qemu and check its network
+Test_Create_Qemu ${TIMEOUT}
+
+# If qemu network is up, check ssh service in qemu
+if [ $? -eq 0 ]; then
+        Test_Info "Begin to Test SSH Service in Qemu"
+        Test_SSH_UP ${TARGET_IPADDR} ${TIMEOUT}
+        RET=$?
+else
+        RET=1
+fi
+
+# Check if gcc/g++/make can work in target
+if [ $RET -eq 0 -a -f $TOOLS/compiler_test.sh ]; then
+        # Copy compiler_test.sh into target
+        Test_Target_Pre ${TARGET_IPADDR} $TOOLS/compiler_test.sh
+        if [ $? -eq 0 ]; then
+                # Run compiler_test.sh to check if gcc/g++/make can work in target
+                Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/compiler_test.sh"
+                RET=$?
+        else
+                RET=1
+        fi
+fi
+
+if [ ${RET} -eq 0 ]; then
+        Test_Info "Compiler Test PASS"
+        Test_Kill_Qemu
+        Test_Print_Result "compiler" 0
+        exit 0
+else
+        Test_Info "Compiler FAIL, Pls. check above error log"
+        Test_Kill_Qemu
+        Test_Print_Result "compiler" 1
+        exit 1
+fi
diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman
new file mode 100755
index 0000000000..fca6a27845
--- /dev/null
+++ b/scripts/qemuimage-tests/sanity/connman
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Conmman Check Test Case for Sanity Test
+# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# Then check if connman can work in target.
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+. $POKYBASE/scripts/qemuimage-testlib
+
+TIMEOUT=400
+RET=1
+
+# Start qemu and check its network
+Test_Create_Qemu ${TIMEOUT}
+
+# If qemu network is up, check ssh service in qemu
+if [ $? -eq 0 ]; then
+        Test_Info "Begin to Test SSH Service in Qemu"
+        Test_SSH_UP ${TARGET_IPADDR} ${TIMEOUT}
+        RET=$?
+else
+        RET=1
+fi
+
+# Check if connman can work in target
+if [ $RET -eq 0 -a -f $TOOLS/connman_test.sh ]; then
+        # Copy connman_test.sh into target
+        Test_Target_Pre ${TARGET_IPADDR} $TOOLS/connman_test.sh
+        if [ $? -eq 0 ]; then
+                # Run connman_test.sh to check if connman can work in target
+                Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/connman_test.sh"
+                RET=$?
+        else
+                RET=1
+        fi
+fi
+
+if [ ${RET} -eq 0 ]; then
+        Test_Info "Connman Test PASS"
+        Test_Kill_Qemu
+        Test_Print_Result "connman" 0
+        exit 0
+else
+        Test_Info "Connman Test FAIL, Pls. check above error log"
+        Test_Kill_Qemu
+        Test_Print_Result "connman" 1
+        exit 1
+fi
diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg
index 36813dcd43..5ed31b735f 100755
--- a/scripts/qemuimage-tests/sanity/dmesg
+++ b/scripts/qemuimage-tests/sanity/dmesg
@@ -11,7 +11,7 @@
 
 . $POKYBASE/scripts/qemuimage-testlib
 
-TIMEOUT=360
+TIMEOUT=400
 RET=1
 
 # Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query
new file mode 100755
index 0000000000..08017ffbe6
--- /dev/null
+++ b/scripts/qemuimage-tests/sanity/rpm_query
@@ -0,0 +1,52 @@
+#!/bin/bash
+# RPM Check Test Case for Sanity Test
+# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# Then check if rpm command can work in target.
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+. $POKYBASE/scripts/qemuimage-testlib
+
+TIMEOUT=400
+RET=1
+
+# Start qemu and check its network
+Test_Create_Qemu ${TIMEOUT}
+
+# If qemu network is up, check ssh service in qemu
+if [ $? -eq 0 ]; then
+        Test_Info "Begin to Test SSH Service in Qemu"
+        Test_SSH_UP ${TARGET_IPADDR} ${TIMEOUT}
+        RET=$?
+else
+        RET=1
+fi
+
+# Check if rpm query can work in target
+if [ $RET -eq 0 -a -f $TOOLS/rpm_test.sh ]; then
+        # Copy rpm_test.sh into target
+        Test_Target_Pre ${TARGET_IPADDR} $TOOLS/rpm_test.sh
+        if [ $? -eq 0 ]; then
+                # Run rpm_test.sh to check if rpm query can work in target
+                Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/rpm_test.sh -qa"
+                RET=$?
+        else
+                RET=1
+        fi
+fi
+
+if [ ${RET} -eq 0 ]; then
+        Test_Info "rpm query Test PASS"
+        Test_Kill_Qemu
+        Test_Print_Result "rpm_query" 0
+        exit 0
+else
+        Test_Info "rpm query FAIL, Pls. check above error log"
+        Test_Kill_Qemu
+        Test_Print_Result "rpm_query" 1
+        exit 1
+fi
diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp
index ce3489d664..c72cdc9d65 100755
--- a/scripts/qemuimage-tests/sanity/scp
+++ b/scripts/qemuimage-tests/sanity/scp
@@ -11,7 +11,7 @@
 
 . $POKYBASE/scripts/qemuimage-testlib
 
-TIMEOUT=360
+TIMEOUT=400
 RET=1
 SPID=0
 i=0
diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown
index e36b4a983d..bc08cf0fdc 100755
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -13,7 +13,8 @@
 
 . $POKYBASE/scripts/qemuimage-testlib
 
-TIMEOUT=360
+TIMEOUT=400
+
 RET=1
 i=0
 
@@ -61,6 +62,11 @@ fi
 if [ ${RET} -eq 0 ]; then
         Test_Info "Shutdown Test PASS"
         Test_Print_Result "shutdown" 0
+        
+        # Remove TARGET_IPSAVE since no existing qemu running now
+        if [ -e ${TARGET_IPSAVE} ]; then
+                rm -rf ${TARGET_IPSAVE}
+        fi
         exit 0
 else
         Test_Info "Shutdown Test FAIL"
diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh
index 084530adfb..2a0e934392 100755
--- a/scripts/qemuimage-tests/sanity/ssh
+++ b/scripts/qemuimage-tests/sanity/ssh
@@ -11,7 +11,7 @@
 
 . $POKYBASE/scripts/qemuimage-testlib
 
-TIMEOUT=360
+TIMEOUT=400
 RET=1
 
 # Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help
new file mode 100755
index 0000000000..1ab6d2407f
--- /dev/null
+++ b/scripts/qemuimage-tests/sanity/zypper_help
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Zypper Check Test Case for Sanity Test
+# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# Then check if zypper command can work in target.
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+. $POKYBASE/scripts/qemuimage-testlib
+
+TIMEOUT=400
+RET=1
+
+# Start qemu and check its network
+Test_Create_Qemu ${TIMEOUT}
+
+# If qemu network is up, check ssh service in qemu
+if [ $? -eq 0 ]; then
+        Test_Info "Begin to Test SSH Service in Qemu"
+        Test_SSH_UP ${TARGET_IPADDR} ${TIMEOUT}
+        RET=$?
+else
+        RET=1
+fi
+
+# Check if zypper help can work in target
+if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
+        # Copy zypper_test.sh into target
+        Test_Target_Pre ${TARGET_IPADDR} $TOOLS/zypper_test.sh
+        if [ $? -eq 0 ]; then
+                # Run zypper_test.sh to check if zypper help can work in target
+                Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/zypper_test.sh help"
+                RET=$?
+        else
+                RET=1
+        fi
+fi
+
+if [ ${RET} -eq 0 ]; then
+        Test_Info "zypper help Test PASS"
+        Test_Kill_Qemu
+        Test_Print_Result "zypper_help" 0
+        exit 0
+else
+        Test_Info "zypper help FAIL, Pls. check above error log"
+        Test_Kill_Qemu
+        Test_Print_Result "zypper_help" 1
+        exit 1
+fi
diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search
new file mode 100755
index 0000000000..d6bcd27a34
--- /dev/null
+++ b/scripts/qemuimage-tests/sanity/zypper_search
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Zypper Check Test Case for Sanity Test
+# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# Then check if zypper command can work in target.
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+. $POKYBASE/scripts/qemuimage-testlib
+
+TIMEOUT=400
+RET=1
+
+# Start qemu and check its network
+Test_Create_Qemu ${TIMEOUT}
+
+# If qemu network is up, check ssh service in qemu
+if [ $? -eq 0 ]; then
+        Test_Info "Begin to Test SSH Service in Qemu"
+        Test_SSH_UP ${TARGET_IPADDR} ${TIMEOUT}
+        RET=$?
+else
+        RET=1
+fi
+
+# Check if zypper search can work in target
+if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
+        # Copy zypper_test.sh into target
+        Test_Target_Pre ${TARGET_IPADDR} $TOOLS/zypper_test.sh
+        if [ $? -eq 0 ]; then
+                # Run zypper_test.sh to check if zypper search can work in target
+                Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/zypper_test.sh search avahi"
+                RET=$?
+        else
+                RET=1
+        fi
+fi
+
+if [ ${RET} -eq 0 ]; then
+        Test_Info "zypper search package avahi Test PASS"
+        Test_Kill_Qemu
+        Test_Print_Result "zypper_search" 0
+        exit 0
+else
+        Test_Info "zypper search package avahi FAIL, Pls. check above error log"
+        Test_Kill_Qemu
+        Test_Print_Result "zypper_search" 1
+        exit 1
+fi