diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-11-15 01:42:49 -0800 |
|---|---|---|
| committer | Robert Yang <liezhi.yang@windriver.com> | 2016-12-21 06:18:56 +0000 |
| commit | 4ca9366fb9e8313ea9bb22257a860064afd68cf8 (patch) | |
| tree | 91e99438b7ea1a161d740e6751dde52efddf6bdd | |
| parent | 990382018e7fc6b4b502fed451b73a83c13c4a24 (diff) | |
| download | openembedded-core-contrib-4ca9366fb9e8313ea9bb22257a860064afd68cf8.tar.gz | |
oeqa/sdkext/devtool.py: remove sources before run test cases
Fixed:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake core-image-minimal -cpopulate_sdk_ext
[snip]
ERROR: Source tree path /path/to/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testsdkext/tc/workspace/sources/v4l2loopback-driver already exists and is not empty\n'
[snip]
This is because the test case will run twice
(environment-setup-core2-64-poky-linux and
environment-setup-x86-pokymllib32-linux), it would fail in the second
run, 'devtool reset' can not remove sources, so remove it before running
test cases.
[YOCTO #10647]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/lib/oeqa/sdkext/devtool.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py index 65f41f6875..f101eb619a 100644 --- a/meta/lib/oeqa/sdkext/devtool.py +++ b/meta/lib/oeqa/sdkext/devtool.py @@ -15,6 +15,9 @@ class DevtoolTest(oeSDKExtTest): self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake") shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst) + # Clean sources dir to make "git clone" can run again + shutil.rmtree(os.path.join(self.tc.sdktestdir, "tc/workspace/sources"), True) + def _test_devtool_build(self, directory): self._run('devtool add myapp %s' % directory) try: |