Now the build directory is setup by Test class, so the builddir attr
points to the actual BUILDDIR instead of get from environment.
Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com>
---
meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 7 +++----
meta/lib/oeqa/selftest/cases/bbtests.py | 4 ++--
meta/lib/oeqa/selftest/cases/eSDK.py | 2 +-
meta/lib/oeqa/selftest/cases/signing.py | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
index b42aa3638d5..98b8b60f51a 100644
--- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
+++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
@@ -11,7 +11,6 @@ class RebuildFromSState(SStateBase):
@classmethod
def setUpClass(self):
super(RebuildFromSState, self).setUpClass()
- self.builddir = os.path.join(os.environ.get('BUILDDIR'))
def get_dep_targets(self, primary_targets):
found_targets = []
@@ -24,16 +23,16 @@ class RebuildFromSState(SStateBase):
os.mkdir(builddir)
self.track_for_cleanup(builddir)
os.mkdir(os.path.join(builddir, 'conf'))
- shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'),
'conf/local.conf'), os.path.join(builddir, 'conf/local.conf'))
+ shutil.copyfile(self.localconf_path, os.path.join(builddir,
'conf/local.conf'))
config = {}
config['default_sstate_dir'] = "SSTATE_DIR ?=
\"${TOPDIR}/sstate-cache\""
config['null_sstate_mirrors'] = "SSTATE_MIRRORS = \"\""
config['default_tmp_dir'] = "TMPDIR = \"${TOPDIR}/tmp\""
for key in config:
ftools.append_file(os.path.join(builddir, 'conf/selftest.inc'),
config[key])
- shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'),
'conf/bblayers.conf'), os.path.join(builddir, 'conf/bblayers.conf'))
+ shutil.copyfile(self.local_bblayers_path, os.path.join(builddir,
'conf/bblayers.conf'))
try:
- shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'),
'conf/auto.conf'), os.path.join(builddir, 'conf/auto.conf'))
+ shutil.copyfile(self.autoconf_path, os.path.join(builddir,
'conf/auto.conf'))
except:
pass
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py
b/meta/lib/oeqa/selftest/cases/bbtests.py
index 4c82049032b..df11a6bc6d0 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -22,8 +22,8 @@ class BitbakeTests(OESelftestTestCase):
@OETestID(790)
def test_run_bitbake_from_dir_2(self):
my_env = os.environ.copy()
- my_env['BBPATH'] = my_env['BUILDDIR']
- os.chdir(os.path.dirname(os.environ['BUILDDIR']))
+ my_env['BBPATH'] = self.builddir
+ os.chdir(os.path.dirname(self.builddir))
self.assertEqual(bitbake('-e', env=my_env).status, 0, msg = "bitbake
couldn't run from builddir")
@OETestID(806)
diff --git a/meta/lib/oeqa/selftest/cases/eSDK.py
b/meta/lib/oeqa/selftest/cases/eSDK.py
index f36c3ccd3b4..60f4e239ab0 100644
--- a/meta/lib/oeqa/selftest/cases/eSDK.py
+++ b/meta/lib/oeqa/selftest/cases/eSDK.py
@@ -49,7 +49,7 @@ class oeSDKExtSelfTest(OESelftestTestCase):
@staticmethod
def update_configuration(cls, image, tmpdir_eSDKQA, env_eSDK,
ext_sdk_path):
- sstate_dir = os.path.join(os.environ['BUILDDIR'], 'sstate-cache')
+ sstate_dir = os.path.join(cls.builddir, 'sstate-cache')
oeSDKExtSelfTest.generate_eSDK(cls.image)
diff --git a/meta/lib/oeqa/selftest/cases/signing.py
b/meta/lib/oeqa/selftest/cases/signing.py
index edb5f653f20..6ef8d8eb5d0 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -105,7 +105,7 @@ class Signing(OESelftestTestCase):
test_recipe = 'ed'
- builddir = os.environ.get('BUILDDIR')
+ builddir = self.builddir
sstatedir = os.path.join(builddir, 'test-sstate')
self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe)
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
