* [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk
@ 2011-02-10 14:57 Jiajun Xu
2011-02-10 14:57 ` [PATCH 1/1] qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk Jiajun Xu
2011-02-10 15:28 ` [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Jiajun Xu @ 2011-02-10 14:57 UTC (permalink / raw)
To: poky
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%)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk
2011-02-10 14:57 [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Jiajun Xu
@ 2011-02-10 14:57 ` Jiajun Xu
2011-02-10 15:28 ` [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Jiajun Xu @ 2011-02-10 14:57 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk
2011-02-10 14:57 [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Jiajun Xu
2011-02-10 14:57 ` [PATCH 1/1] qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk Jiajun Xu
@ 2011-02-10 15:28 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-02-10 15:28 UTC (permalink / raw)
To: Jiajun Xu; +Cc: poky
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-10 15:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-10 14:57 [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Jiajun Xu
2011-02-10 14:57 ` [PATCH 1/1] qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk Jiajun Xu
2011-02-10 15:28 ` [PATCH 0/1] qemuimagetest: Rename test scenario file from *-sdk to *-sato-sdk Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.