[OE-core] [PATCH 1/1] ptest-runner: trivial fixes and refine
rongqing.li at windriver.com
rongqing.li at windriver.com
Wed Sep 11 07:34:07 UTC 2013
From: Roy Li <rongqing.li at 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 at 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
More information about the Openembedded-core
mailing list