[PATCH] oeqa/utils: Allow ~ in bblayers

[PATCH] oeqa/utils: Allow ~ in bblayers

[Ed Bartosh]

Bitbake can parse ~ in bblayer's paths.
Added this functionality to oeqa code.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 meta/lib/oeqa/utils/commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index e8a467f..bc1dbb1 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -155,6 +155,8 @@ def get_test_layer():
     layers = get_bb_var("BBLAYERS").split()
     testlayer = None
     for l in layers:
+        if '~' in l:
+            l = os.path.expanduser(l)
         if "/meta-selftest" in l and os.path.isdir(l):
             testlayer = l
             break
-- 
2.1.4

Re: [PATCH] oeqa/utils: Allow ~ in bblayers

[Mario Domenech Goulart]

Hi Ed,

On Thu, 30 Apr 2015 14:04:50 +0300 Ed Bartosh <ed.bartosh@linux.intel.com> wrote:

> Bitbake can parse ~ in bblayer's paths.
> Added this functionality to oeqa code.
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
>  meta/lib/oeqa/utils/commands.py | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
> index e8a467f..bc1dbb1 100644
> --- a/meta/lib/oeqa/utils/commands.py
> +++ b/meta/lib/oeqa/utils/commands.py
> @@ -155,6 +155,8 @@ def get_test_layer():
>      layers = get_bb_var("BBLAYERS").split()
>      testlayer = None
>      for l in layers:
> +        if '~' in l:
> +            l = os.path.expanduser(l)

Is the "if '~' in l" test necessary?

AFAIK, applying expanduser to a string that doesn't contain '~' will
just return the string itself.

>          if "/meta-selftest" in l and os.path.isdir(l):
>              testlayer = l
>              break
> -- 
> 2.1.4

Best wishes.
Mario
-- 
http://www.ossystems.com.br

Re: [PATCH] oeqa/utils: Allow ~ in bblayers

[Gary Thomas]

On 2015-04-30 07:08, Mario Domenech Goulart wrote:
> Hi Ed,
>
> On Thu, 30 Apr 2015 14:04:50 +0300 Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
>
>> Bitbake can parse ~ in bblayer's paths.
>> Added this functionality to oeqa code.
>>
>> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>> ---
>>   meta/lib/oeqa/utils/commands.py | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
>> index e8a467f..bc1dbb1 100644
>> --- a/meta/lib/oeqa/utils/commands.py
>> +++ b/meta/lib/oeqa/utils/commands.py
>> @@ -155,6 +155,8 @@ def get_test_layer():
>>       layers = get_bb_var("BBLAYERS").split()
>>       testlayer = None
>>       for l in layers:
>> +        if '~' in l:
>> +            l = os.path.expanduser(l)
>
> Is the "if '~' in l" test necessary?
>
> AFAIK, applying expanduser to a string that doesn't contain '~' will
> just return the string itself.

True, but why expand (create a new string, have to garbage-collect
the old one, etc) when it's not necessary?

>
>>           if "/meta-selftest" in l and os.path.isdir(l):
>>               testlayer = l
>>               break

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [PATCH] oeqa/utils: Allow ~ in bblayers

[Ed Bartosh]

On Thu, Apr 30, 2015 at 01:08:09PM +0000, Mario Domenech Goulart wrote:
> Hi Ed,
> 
> On Thu, 30 Apr 2015 14:04:50 +0300 Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> 
> > Bitbake can parse ~ in bblayer's paths.
> > Added this functionality to oeqa code.
> >
> > Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> > ---
> >  meta/lib/oeqa/utils/commands.py | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
> > index e8a467f..bc1dbb1 100644
> > --- a/meta/lib/oeqa/utils/commands.py
> > +++ b/meta/lib/oeqa/utils/commands.py
> > @@ -155,6 +155,8 @@ def get_test_layer():
> >      layers = get_bb_var("BBLAYERS").split()
> >      testlayer = None
> >      for l in layers:
> > +        if '~' in l:
> > +            l = os.path.expanduser(l)
> 
> Is the "if '~' in l" test necessary?
> 

I did this to show why expanduser is called at all. This makes code self-explanatory and easier to understand.
I was suggested to do it here: http://lists.openembedded.org/pipermail/bitbake-devel/2015-April/005661.html

--
Regards,
Ed

Re: [PATCH] oeqa/utils: Allow ~ in bblayers

[Mario Domenech Goulart]

On Thu, 30 Apr 2015 07:16:28 -0600 Gary Thomas <gary@mlbassoc.com> wrote:

> On 2015-04-30 07:08, Mario Domenech Goulart wrote:
>>
>> On Thu, 30 Apr 2015 14:04:50 +0300 Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
>>
>>> Bitbake can parse ~ in bblayer's paths.
>>> Added this functionality to oeqa code.
>>>
>>> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>>> ---
>>>   meta/lib/oeqa/utils/commands.py | 2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
>>> index e8a467f..bc1dbb1 100644
>>> --- a/meta/lib/oeqa/utils/commands.py
>>> +++ b/meta/lib/oeqa/utils/commands.py
>>> @@ -155,6 +155,8 @@ def get_test_layer():
>>>       layers = get_bb_var("BBLAYERS").split()
>>>       testlayer = None
>>>       for l in layers:
>>> +        if '~' in l:
>>> +            l = os.path.expanduser(l)
>>
>> Is the "if '~' in l" test necessary?
>>
>> AFAIK, applying expanduser to a string that doesn't contain '~' will
>> just return the string itself.
>
> True, but why expand (create a new string, have to garbage-collect
> the old one, etc) when it's not necessary?

Good point, Gary.  Maybe we should only care about '~' as the first
character in paths?  In this case, "if l.startswith('~')" would do the
trick.

Best wishes.
Mario
-- 
http://www.ossystems.com.br