[PATCH 0/1] testsdkext: remove workspace/sources to avoid failure in case of multilib

[PATCH 0/1] testsdkext: remove workspace/sources to avoid failure in case of multilib

[Chen Qi]

The following changes since commit f301a3bc110608c3684c78dd62e276beea73bd94:

  settings-daemon: Drop pointless apply=yes in SRC_URI (2018-05-04 13:28:06 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/testsdkext-multilib-cleanup
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/testsdkext-multilib-cleanup

Chen Qi (1):
  testsdkext: remove workspace/sources to avoid failure in case of
    multilib

 meta/classes/testsdk.bbclass | 3 +++
 1 file changed, 3 insertions(+)

-- 
1.9.1

[PATCH 1/1] testsdkext: remove workspace/sources to avoid failure in case of multilib

[Chen Qi]

When multilib is enabled, there are multiple environment scripts, and the
test cases for eSDK are executed for each environment script.

And we will have the following problem when executing test cases for the
second environment script.

  ERROR: Source tree path /.../workspace/sources/librdfa already exists and is not empty

So after executing test cases for one environment, we clean up the sources
diretory to avoid such failure.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/classes/testsdk.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 2e43343..54719a1 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -183,6 +183,9 @@ def testsdkext_main(d):
         if not result.wasSuccessful():
             fail = True
 
+        # Clean the workspace/sources to avoid `devtool add' failure because of non-empty source directory
+        bb.utils.remove(sdk_dir+'workspace/sources', True)
+
     if fail:
         bb.fatal("%s - FAILED - check the task log and the commands log" % pn)
 
-- 
1.9.1

Re: [PATCH 1/1] testsdkext: remove workspace/sources to avoid failure in case of multilib

[ChenQi]

ping

On 05/08/2018 04:07 PM, Chen Qi wrote:
> When multilib is enabled, there are multiple environment scripts, and the
> test cases for eSDK are executed for each environment script.
>
> And we will have the following problem when executing test cases for the
> second environment script.
>
>    ERROR: Source tree path /.../workspace/sources/librdfa already exists and is not empty
>
> So after executing test cases for one environment, we clean up the sources
> diretory to avoid such failure.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   meta/classes/testsdk.bbclass | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
> index 2e43343..54719a1 100644
> --- a/meta/classes/testsdk.bbclass
> +++ b/meta/classes/testsdk.bbclass
> @@ -183,6 +183,9 @@ def testsdkext_main(d):
>           if not result.wasSuccessful():
>               fail = True
>   
> +        # Clean the workspace/sources to avoid `devtool add' failure because of non-empty source directory
> +        bb.utils.remove(sdk_dir+'workspace/sources', True)
> +
>       if fail:
>           bb.fatal("%s - FAILED - check the task log and the commands log" % pn)
>