Skip to contentSkip to conversation

testsdkext: remove workspace/sources to avoid failure in case of multilib

PATCH In review Chen Qi 1 participant 3 messages May 8, 2018 – Aug 27, 2018

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover testsdkext: remove workspace/sources to avoid failure in case of multilib

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(+)
Signature · 1 line
1.9.1
author
#1 lore raw

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

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.

---
 meta/classes/testsdk.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/testsdk.bbclass +3 -0
index 2e43343..54719a1 100644
@@ -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)
 
Signature · 1 line
1.9.1
author
#2 lore raw

ping

Quoted 30 lines · 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.

---
  meta/classes/testsdk.bbclass | 3 +++
  1 file changed, 3 insertions(+)
meta/classes/testsdk.bbclass +3 -0
index 2e43343..54719a1 100644
@@ -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)