From dbeac4fc4558d2b6eed6155f6a834a15c2e02715 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 29 Sep 2020 11:22:15 +0800 Subject: 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. (From OE-Core rev: f55924d8d2258ca8b60c46d78ae2de06add59798) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdkext/testsdk.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/lib/oeqa/sdkext/testsdk.py') 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) -- cgit v1.2.3-54-g00ecf