[PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk

[PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk

[Jiajun Xu]

From: Jiajun Xu <jiajun.xu@intel.com>

Change the name of test scenario file from -sdk to -sato-sdk

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: jxu49/master
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/master

Thanks,
    Jiajun Xu <jiajun.xu@intel.com>
---


Jiajun Xu (1):
  qemuimagetest: Rename test scenario file from poky-image-sdk to
    poky-image-sato-sdk

 scripts/qemuimage-testlib                          |    6 ++++--
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 6 files changed, 4 insertions(+), 2 deletions(-)
 rename scripts/qemuimage-tests/scenario/qemuarm/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemumips/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemuppc/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemux86-64/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemux86/{poky-image-sdk => poky-image-sato-sdk} (100%)

[PATCH 1/1] qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk

[Jiajun Xu]

From: Jiajun Xu <jiajun.xu@intel.com>

Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
---
 scripts/qemuimage-testlib                          |    6 ++++--
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 .../{poky-image-sdk => poky-image-sato-sdk}        |    0
 6 files changed, 4 insertions(+), 2 deletions(-)
 rename scripts/qemuimage-tests/scenario/qemuarm/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemumips/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemuppc/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemux86-64/{poky-image-sdk => poky-image-sato-sdk} (100%)
 rename scripts/qemuimage-tests/scenario/qemux86/{poky-image-sdk => poky-image-sato-sdk} (100%)

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 823cbfa..720ee8f 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
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
-- 
1.7.1

Re: [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk

[Richard Purdie]

On Thu, 2011-02-10 at 22:57 +0800, Jiajun Xu wrote:
> From: Jiajun Xu <jiajun.xu@intel.com>
> 
> Change the name of test scenario file from -sdk to -sato-sdk
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: jxu49/master
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/master
> 
> Thanks,
>     Jiajun Xu <jiajun.xu@intel.com>

Merged to master, thanks!

Richard