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>

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index ce20164..06ba3e3 100644 (file)
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -86,10 +86,10 @@ def qemuimagetest_main(d):
         for test in list:
             (scen, case, fullpath) = test
 
-            """Skip rpm/zypper if package_rpm not set for PACKAGE_CLASSES"""
-            if case.find("zypper") != -1 or case.find("rpm") != -1:
+            """Skip rpm/smart if package_rpm not set for PACKAGE_CLASSES"""
+            if case.find("smart") != -1 or case.find("rpm") != -1:
                 if d.getVar("PACKAGE_CLASSES", True).find("rpm", 0, 11) == -1:
-                    bb.note("skip rpm/zypper cases since package_rpm not set in PACKAGE_CLASSES")
+                    bb.note("skip rpm/smart cases since package_rpm not set in PACKAGE_CLASSES")
                     continue
                 else:
                     final_list.append((scen, case, fullpath))

diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/smart_help
similarity index 52%
rename from scripts/qemuimage-tests/sanity/zypper_help
rename to scripts/qemuimage-tests/sanity/smart_help
index 94f82c4..0eeac26 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/zypper_help
+++ b/scripts/qemuimage-tests/sanity/smart_help
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Zypper Check Test Case for Sanity Test
+# Smart Check Test Case for Sanity Test
 # The case boot up the Qemu target with `runqemu qemuxxx`.
-# Then check if zypper command can work in target.
+# Then check if smart command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
 #
@@ -26,13 +26,13 @@ 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
+# Check if smart --help can work in target
+if [ $RET -eq 0 -a -f $TOOLS/smart_test.sh ]; then
+       # Copy smart_test.sh into target
+       Test_Target_Pre ${TARGET_IPADDR} $TOOLS/smart_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"
+               # Run smart_test.sh to check if smart --help can work in target
+               Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/smart_test.sh --help"
                RET=$?
        else
                RET=1
@@ -40,13 +40,13 @@ if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
 fi
 
 if [ ${RET} -eq 0 ]; then
-       Test_Info "zypper help Test PASS"
+       Test_Info "smart --help Test PASS"
        Test_Kill_Qemu
-       Test_Print_Result "zypper_help" 0
+       Test_Print_Result "smart_help" 0
        exit 0
 else
-       Test_Info "zypper help FAIL, Pls. check above error log"
+       Test_Info "smart --help FAIL, Pls. check above error log"
        Test_Kill_Qemu
-       Test_Print_Result "zypper_help" 1
+       Test_Print_Result "smart_help" 1
        exit 1
 fi

diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/smart_query
similarity index 50%
rename from scripts/qemuimage-tests/sanity/zypper_search
rename to scripts/qemuimage-tests/sanity/smart_query
index e687ead..779ee63 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/zypper_search
+++ b/scripts/qemuimage-tests/sanity/smart_query
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Zypper Check Test Case for Sanity Test
+# Smart Check Test Case for Sanity Test
 # The case boot up the Qemu target with `runqemu qemuxxx`.
-# Then check if zypper command can work in target.
+# Then check if smart command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
 #
@@ -26,13 +26,13 @@ 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
+# Check if smart query can work in target
+if [ $RET -eq 0 -a -f $TOOLS/smart_test.sh ]; then
+       # Copy smart_test.sh into target
+       Test_Target_Pre ${TARGET_IPADDR} $TOOLS/smart_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"
+               # Run smart_test.sh to check if smart query can work in target
+               Test_SSH ${TARGET_IPADDR} "sh $TARGET_TEST_DIR/smart_test.sh query avahi*"
                RET=$?
        else
                RET=1
@@ -40,13 +40,13 @@ if [ $RET -eq 0 -a -f $TOOLS/zypper_test.sh ]; then
 fi
 
 if [ ${RET} -eq 0 ]; then
-       Test_Info "zypper search package avahi Test PASS"
+       Test_Info "smart query package avahi Test PASS"
        Test_Kill_Qemu
-       Test_Print_Result "zypper_search" 0
+       Test_Print_Result "smart_query" 0
        exit 0
 else
-       Test_Info "zypper search package avahi FAIL, Pls. check above error log"
+       Test_Info "smart query package avahi FAIL, Pls. check above error log"
        Test_Kill_Qemu
-       Test_Print_Result "zypper_search" 1
+       Test_Print_Result "smart_query" 1
        exit 1
 fi

diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
index 4fa6068..c0fff0e 100644 (file)
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
@@ -1,7 +1,7 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity connman
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity compiler
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
@@ -1,7 +1,7 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity connman
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity compiler
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
@@ -1,7 +1,7 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity connman
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity compiler
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
@@ -1,7 +1,7 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity connman
 sanity 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 (file)
--- 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 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity compiler
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
@@ -1,7 +1,7 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity connman
 sanity 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 (file)
--- a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
@@ -1,8 +1,8 @@
 sanity ssh
 sanity scp
 sanity dmesg
-sanity zypper_help
-sanity zypper_search
+sanity smart_help
+sanity smart_query
 sanity rpm_query
 sanity compiler
 sanity connman

diff --git a/scripts/qemuimage-tests/tools/smart_test.sh b/scripts/qemuimage-tests/tools/smart_test.sh
new file mode 100644 (file)
index 0000000..f278a25
--- /dev/null
+++ b/scripts/qemuimage-tests/tools/smart_test.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# smart test script running in target
+#
+# Author: Jiajun Xu <jiajun.xu@intel.com>
+#
+# This file is licensed under the GNU General Public License,
+# Version 2.
+#
+
+Target_Info()
+{
+       echo -e "\tTARGET: $*"
+}
+
+Target_Err()
+{
+       echo -e "\tTARGET: smart command has issue when running, Pls. check the error log"
+       echo -e "\tTARGET: ##### Error Log #####"
+       $1
+       echo -e "\tTARGET: #####    End    #####"
+}
+
+which smart
+if [ $? -ne 0 ]; then
+       Target_Info "No smart command found"
+       exit 1
+fi
+
+if [ smart > /dev/null 2>&1 ]; then
+       Target_Info "smart command run without problem"
+else
+       Target_Err smart
+       exit 1
+fi
+
+# run smart with specific command parsed to smart_test.sh
+smart $* > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+       Target_Info "smart $* work without problem"
+       exit 0
+else
+       Target_Err "smart $*"
+       exit 1
+fi

diff --git a/scripts/qemuimage-tests/tools/zypper_test.sh b/scripts/qemuimage-tests/tools/zypper_test.sh
deleted file mode 100644 (file)
index 5e8e7aa..0000000
--- a/scripts/qemuimage-tests/tools/zypper_test.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# zypper test script running in target
-#
-# Author: Jiajun Xu <jiajun.xu@intel.com>
-#
-# This file is licensed under the GNU General Public License,
-# Version 2.
-#
-
-Target_Info()
-{
-       echo -e "\tTARGET: $*"
-}
-
-Target_Err()
-{
-       echo -e "\tTARGET: zypper command has issue when running, Pls. check the error log"
-       echo -e "\tTARGET: ##### Error Log #####"
-       $1
-       echo -e "\tTARGET: #####    End    #####"
-}
-
-which zypper
-if [ $? -ne 0 ]; then
-       Target_Info "No zypper command found"
-       exit 1
-fi
-
-if [ zypper > /dev/null 2>&1 ]; then
-       Target_Info "zypper command run without problem"
-else
-       Target_Err zypper
-       exit 1
-fi
-
-# run zypper with specific command parsed to zypper_test.sh
-zypper $* > /dev/null 2>&1
-
-if [ $? -eq 0 ]; then
-       Target_Info "zypper $* work without problem"
-       exit 0
-else
-       Target_Err zypper $*
-       exit 1
-fi