From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 4924B6BD96 for ; Wed, 11 Sep 2013 09:02:41 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r8B92e9C008475 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 11 Sep 2013 02:02:40 -0700 (PDT) Received: from [128.224.162.168] (128.224.162.168) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.347.0; Wed, 11 Sep 2013 02:02:39 -0700 Message-ID: <523031B0.2090408@windriver.com> Date: Wed, 11 Sep 2013 17:02:40 +0800 From: Rongqing Li User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Richard Purdie References: <934e6208f68c0801666853fc81c3f67b39c368cb.1378884764.git.rongqing.li@windriver.com> <1378888802.3484.170.camel@ted> In-Reply-To: <1378888802.3484.170.camel@ted> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] ptest-runner: trivial fixes and refine X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 09:02:41 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit 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 >> >> 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 >> --- >> .../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