qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk

Signed-off-by Jiajun Xu <jiajun.xu@intel.com>

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 823cbfa18b172ff3dd5330c15a8c32fdb28b7a53..720ee8f40758472e66855df08b0ca21b9f9a468a 100644 (file)
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -305,7 +305,8 @@ Test_Find_Image()
                else
                        for i in `dir ${where}`
                        do
-                               echo $i | grep -q "${kernel}.*${arch}.*\.${extension}"
+                               # Exclude qemux86-64 when target is qemux86
+                               echo $i | grep "${kernel}.*${arch}.*\.${extension}" | grep -qv "${kernel}.*${arch}-64.*\.${extension}"
                                if [ $? -eq 0 ]; then
                                        echo ${where}/${i}
                                        return 0
@@ -323,7 +324,8 @@ Test_Find_Image()
                else
                        for i in `dir ${where}`
                        do
-                               echo $i | grep -q "${target}-${arch}.*\.${extension}"
+                               # Exclude qemux86-64 when target is qemux86
+                               echo $i | grep "${target}-${arch}.*\.${extension}" | grep -qv "${target}-${arch}-64.*\.${extension}"
                                if [ $? -eq 0 ]; then
                                        echo ${where}/${i}
                                        return 0

diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk
similarity index 100%
rename from scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
rename to scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk

diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk
similarity index 100%
rename from scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
rename to scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk

diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk
similarity index 100%
rename from scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
rename to scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk

diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk
similarity index 100%
rename from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
rename to scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk

diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk
similarity index 100%
rename from scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
rename to scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk