summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiajun Xu <jiajun.xu@intel.com>2011-02-10 22:50:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-10 15:27:50 +0000
commitd2cfd3c54fd27ea302af390c3c9e9ae60cf26604 (patch)
treeb7319c0b11d8958f5884fde261a20183c2752540
parent33df485498c6338ddcbc711f2807d8ef40b3997b (diff)
downloadpoky-d2cfd3c54fd27ea302af390c3c9e9ae60cf26604.tar.gz
poky-d2cfd3c54fd27ea302af390c3c9e9ae60cf26604.tar.bz2
poky-d2cfd3c54fd27ea302af390c3c9e9ae60cf26604.zip
qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk
Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
-rw-r--r--scripts/qemuimage-testlib6
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk)0
6 files changed, 4 insertions, 2 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 823cbfa18b..720ee8f407 100644
--- 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
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
+++ b/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
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
+++ b/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
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
+++ b/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
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
+++ b/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
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk