mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 09:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/sdkext/cases: Move sdk_update test into devtool module

Browse Source 
With the new OEQA thread support there are problems running
devtool twice at the same time because only one instance of
bitbake/devtool is allowed.

[YOCTO #11450]

(From OE-Core rev: 44254caaef131402629d01f01cdee6722718adba)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2017-05-26 15:37:42 -05:00
committed by Richard Purdie
parent d3d4ba902d
commit f9102ab1ed
2 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/lib/oeqa/sdkext/cases/devtool.py
View File

@@ -1,12 +1,14 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
import os
import shutil
import subprocess
from oeqa.sdkext.case import OESDKExtTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
from oeqa.utils.httpserver import HTTPService
class DevtoolTest(OESDKExtTestCase):
@classmethod
@@ -95,3 +97,33 @@ class DevtoolTest(OESDKExtTestCase):
self._run('devtool build %s ' % package_nodejs)
finally:
self._run('devtool reset %s '% package_nodejs)
class SdkUpdateTest(OESDKExtTestCase):
@classmethod
def setUpClass(self):
self.publish_dir = os.path.join(self.tc.sdk_dir, 'esdk_publish')
if os.path.exists(self.publish_dir):
shutil.rmtree(self.publish_dir)
os.mkdir(self.publish_dir)
base_tcname = "%s/%s" % (self.td.get("SDK_DEPLOY", ''),
self.td.get("TOOLCHAINEXT_OUTPUTNAME", ''))
tcname_new = "%s-new.sh" % base_tcname
if not os.path.exists(tcname_new):
tcname_new = "%s.sh" % base_tcname
cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir)
subprocess.check_output(cmd, shell=True)
self.http_service = HTTPService(self.publish_dir)
self.http_service.start()
self.http_url = "http://127.0.0.1:%d" % self.http_service.port
def test_sdk_update_http(self):
output = self._run("devtool sdk-update \"%s\"" % self.http_url)
@classmethod
def tearDownClass(self):
self.http_service.stop()
shutil.rmtree(self.publish_dir)

39
meta/lib/oeqa/sdkext/cases/sdk_update.py
View File

@@ -1,39 +0,0 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
import os
import shutil
import subprocess
from oeqa.sdkext.case import OESDKExtTestCase
from oeqa.utils.httpserver import HTTPService
class SdkUpdateTest(OESDKExtTestCase):
@classmethod
def setUpClass(self):
self.publish_dir = os.path.join(self.tc.sdk_dir, 'esdk_publish')
if os.path.exists(self.publish_dir):
shutil.rmtree(self.publish_dir)
os.mkdir(self.publish_dir)
base_tcname = "%s/%s" % (self.td.get("SDK_DEPLOY", ''),
self.td.get("TOOLCHAINEXT_OUTPUTNAME", ''))
tcname_new = "%s-new.sh" % base_tcname
if not os.path.exists(tcname_new):
tcname_new = "%s.sh" % base_tcname
cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir)
subprocess.check_output(cmd, shell=True)
self.http_service = HTTPService(self.publish_dir)
self.http_service.start()
self.http_url = "http://127.0.0.1:%d" % self.http_service.port
def test_sdk_update_http(self):
output = self._run("devtool sdk-update \"%s\"" % self.http_url)
@classmethod
def tearDownClass(self):
self.http_service.stop()
shutil.rmtree(self.publish_dir)