* [PATCH 0/1] ptest-runner: trivial fixes and refine
@ 2013-09-11 7:34 rongqing.li
2013-09-11 7:34 ` [PATCH 1/1] " rongqing.li
0 siblings, 1 reply; 4+ messages in thread
From: rongqing.li @ 2013-09-11 7:34 UTC (permalink / raw)
To: openembedded-core
From: Roy Li <rongqing.li@windriver.com>
The following changes since commit 5b451a46550ba62e2fbfe5dbe50723b34a4fd527:
systemd.bbclass: get the correct /lib directory (2013-09-10 23:15:09 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib roy/ptest
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/ptest
Roy Li (1):
ptest-runner: trivial fixes and refine
.../ptest-runner/files/ptest-runner | 30 +++++++++++++++-----
1 file changed, 23 insertions(+), 7 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] ptest-runner: trivial fixes and refine
2013-09-11 7:34 [PATCH 0/1] ptest-runner: trivial fixes and refine rongqing.li
@ 2013-09-11 7:34 ` rongqing.li
2013-09-11 8:40 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: rongqing.li @ 2013-09-11 7:34 UTC (permalink / raw)
To: openembedded-core
From: Roy Li <rongqing.li@windriver.com>
1. ptest files may be installed under /usr/lib64/ for 64bit filesystem
or under /usr/lib/ for 64bit multilib filesystem, so we should check both
directories
2. If a soft link is linking to a directory under the same directory, we
only run once.
[YOCTO #5125]
[YOCTO #5126]
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
.../ptest-runner/files/ptest-runner | 30 +++++++++++++++-----
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-support/ptest-runner/files/ptest-runner b/meta/recipes-support/ptest-runner/files/ptest-runner
index 4f3c7ce..724e066 100644
--- a/meta/recipes-support/ptest-runner/files/ptest-runner
+++ b/meta/recipes-support/ptest-runner/files/ptest-runner
@@ -1,16 +1,32 @@
#!/bin/sh
echo "START: $0"
-cd /usr/lib
-for x in *
+
+for libdir in /usr/lib/ /usr/lib64/
do
- if [ -x "/usr/lib/$x/ptest/run-ptest" ]; then
- date "+%Y-%m-%dT%H:%M"
+
+ [ ! -d "$libdir" ] && continue
+
+ cd "$libdir"
+ for x in `find -L ./ -name run-ptest -type f -perm /u+x,g+x`
+ do
+ # test if a dir is linking to one that they are under same directory
+ # like perl5-->perl
+ ptestdir=`dirname $x|cut -f2 -d"/"`
+ if [ -h "$ptestdir" ]; then
+ linkdir=`readlink -f "$ptestdir"`
+ if [ `dirname "$linkdir"`"/" = "$libdir" ]; then
+ continue
+ fi
+ fi
+
+ date "+%Y-%m-%dT%H:%M"
echo "BEGIN: $x"
- cd /usr/lib/$x/ptest
+ pushd `dirname "$x"`
./run-ptest
+ popd
echo "END: $x"
- date "+%Y-%m-%dT%H:%M"
- fi
+ date "+%Y-%m-%dT%H:%M"
+ done
done
echo "STOP: $0"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] ptest-runner: trivial fixes and refine
2013-09-11 7:34 ` [PATCH 1/1] " rongqing.li
@ 2013-09-11 8:40 ` Richard Purdie
2013-09-11 9:02 ` Rongqing Li
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2013-09-11 8:40 UTC (permalink / raw)
To: rongqing.li; +Cc: openembedded-core
On Wed, 2013-09-11 at 15:34 +0800, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> 1. ptest files may be installed under /usr/lib64/ for 64bit filesystem
> or under /usr/lib/ for 64bit multilib filesystem, so we should check both
> directories
>
> 2. If a soft link is linking to a directory under the same directory, we
> only run once.
>
> [YOCTO #5125]
> [YOCTO #5126]
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
> .../ptest-runner/files/ptest-runner | 30 +++++++++++++++-----
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-support/ptest-runner/files/ptest-runner b/meta/recipes-support/ptest-runner/files/ptest-runner
> index 4f3c7ce..724e066 100644
> --- a/meta/recipes-support/ptest-runner/files/ptest-runner
> +++ b/meta/recipes-support/ptest-runner/files/ptest-runner
> @@ -1,16 +1,32 @@
> #!/bin/sh
>
> echo "START: $0"
> -cd /usr/lib
> -for x in *
> +
> +for libdir in /usr/lib/ /usr/lib64/
We shouldn't hard code this. To keep things simple, I think you need to
search /usr/lib*...
Cheers,
Richard
> do
> - if [ -x "/usr/lib/$x/ptest/run-ptest" ]; then
> - date "+%Y-%m-%dT%H:%M"
> +
> + [ ! -d "$libdir" ] && continue
> +
> + cd "$libdir"
> + for x in `find -L ./ -name run-ptest -type f -perm /u+x,g+x`
> + do
> + # test if a dir is linking to one that they are under same directory
> + # like perl5-->perl
> + ptestdir=`dirname $x|cut -f2 -d"/"`
> + if [ -h "$ptestdir" ]; then
> + linkdir=`readlink -f "$ptestdir"`
> + if [ `dirname "$linkdir"`"/" = "$libdir" ]; then
> + continue
> + fi
> + fi
> +
> + date "+%Y-%m-%dT%H:%M"
> echo "BEGIN: $x"
> - cd /usr/lib/$x/ptest
> + pushd `dirname "$x"`
> ./run-ptest
> + popd
> echo "END: $x"
> - date "+%Y-%m-%dT%H:%M"
> - fi
> + date "+%Y-%m-%dT%H:%M"
> + done
> done
> echo "STOP: $0"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] ptest-runner: trivial fixes and refine
2013-09-11 8:40 ` Richard Purdie
@ 2013-09-11 9:02 ` Rongqing Li
0 siblings, 0 replies; 4+ messages in thread
From: Rongqing Li @ 2013-09-11 9:02 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 09/11/2013 04:40 PM, Richard Purdie wrote:
> On Wed, 2013-09-11 at 15:34 +0800, rongqing.li@windriver.com wrote:
>> From: Roy Li <rongqing.li@windriver.com>
>>
>> 1. ptest files may be installed under /usr/lib64/ for 64bit filesystem
>> or under /usr/lib/ for 64bit multilib filesystem, so we should check both
>> directories
>>
>> 2. If a soft link is linking to a directory under the same directory, we
>> only run once.
>>
>> [YOCTO #5125]
>> [YOCTO #5126]
>>
>> Signed-off-by: Roy Li <rongqing.li@windriver.com>
>> ---
>> .../ptest-runner/files/ptest-runner | 30 +++++++++++++++-----
>> 1 file changed, 23 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta/recipes-support/ptest-runner/files/ptest-runner b/meta/recipes-support/ptest-runner/files/ptest-runner
>> index 4f3c7ce..724e066 100644
>> --- a/meta/recipes-support/ptest-runner/files/ptest-runner
>> +++ b/meta/recipes-support/ptest-runner/files/ptest-runner
>> @@ -1,16 +1,32 @@
>> #!/bin/sh
>>
>> echo "START: $0"
>> -cd /usr/lib
>> -for x in *
>> +
>> +for libdir in /usr/lib/ /usr/lib64/
>
>
> We shouldn't hard code this. To keep things simple, I think you need to
> search /usr/lib*...
>
> Cheers,
>
> Richard
Thanks, I will change it
-Roy
>
>> do
>> - if [ -x "/usr/lib/$x/ptest/run-ptest" ]; then
>> - date "+%Y-%m-%dT%H:%M"
>> +
>> + [ ! -d "$libdir" ] && continue
>> +
>> + cd "$libdir"
>> + for x in `find -L ./ -name run-ptest -type f -perm /u+x,g+x`
>> + do
>> + # test if a dir is linking to one that they are under same directory
>> + # like perl5-->perl
>> + ptestdir=`dirname $x|cut -f2 -d"/"`
>> + if [ -h "$ptestdir" ]; then
>> + linkdir=`readlink -f "$ptestdir"`
>> + if [ `dirname "$linkdir"`"/" = "$libdir" ]; then
>> + continue
>> + fi
>> + fi
>> +
>> + date "+%Y-%m-%dT%H:%M"
>> echo "BEGIN: $x"
>> - cd /usr/lib/$x/ptest
>> + pushd `dirname "$x"`
>> ./run-ptest
>> + popd
>> echo "END: $x"
>> - date "+%Y-%m-%dT%H:%M"
>> - fi
>> + date "+%Y-%m-%dT%H:%M"
>> + done
>> done
>> echo "STOP: $0"
>
>
>
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-11 9:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 7:34 [PATCH 0/1] ptest-runner: trivial fixes and refine rongqing.li
2013-09-11 7:34 ` [PATCH 1/1] " rongqing.li
2013-09-11 8:40 ` Richard Purdie
2013-09-11 9:02 ` Rongqing Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox