From: Chen Qi Date: Tue, 29 Sep 2020 03:22:15 +0000 (+0800) Subject: testsdk.py: remove workspace/sources to avoid failure in case of multilib X-Git-Tag: 2020-10-gatesgarth~124 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f55924d8d2258ca8b60c46d78ae2de06add59798;p=openembedded-core.git testsdk.py: 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. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index c5c46df6cd..ffd185ec55 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py @@ -99,6 +99,9 @@ class TestSDKExt(TestSDKBase): 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)