The meta-selftest layer is used by test cases to modify
meta data but in a threaded environment two test cases can
modify the meta data causing errors because the signatures
will change.
Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com>
---
meta/lib/oeqa/selftest/case.py | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py
index 3998aeac5c4..bbdce4cf9e8 100644
--- a/meta/lib/oeqa/selftest/case.py
+++ b/meta/lib/oeqa/selftest/case.py
@@ -7,6 +7,7 @@ import shutil
import glob
import errno
import re
+import subprocess
from unittest.util import safe_repr
import oeqa.utils.ftools as ftools
@@ -24,6 +25,8 @@ class OESelftestTestCase(OETestCase):
@classmethod
def _setUpBuildDir(cls):
+ cls.orig_testlayer_path = cls.tc.config_paths['testlayer_path']
+
if cls._use_own_builddir:
cls.builddir = os.path.join(cls.tc.config_paths['base_builddir'],
cls.__module__, cls.__name__)
@@ -35,14 +38,23 @@ class OESelftestTestCase(OETestCase):
"conf/bblayers.conf")
cls.local_bblayers_backup = os.path.join(cls.builddir,
"conf/bblayers.conf.bk")
+
+ cls.base_testlayer_path = os.path.join(cls.builddir,
+ 'layers')
+ cls.testlayer_path = os.path.join(cls.base_testlayer_path,
+ os.path.basename(cls.orig_testlayer_path))
else:
cls.builddir = cls.tc.config_paths['builddir']
+
cls.localconf_path = cls.tc.config_paths['localconf']
cls.localconf_backup =
cls.tc.config_paths['localconf_class_backup']
cls.local_bblayers_path = cls.tc.config_paths['bblayers']
cls.local_bblayers_backup = \
cls.tc.config_paths['bblayers_class_backup']
+ cls.base_testlayer_path = os.path.dirname(cls.orig_testlayer_path)
+ cls.testlayer_path = cls.orig_testlayer_path
+
cls.testinc_path = os.path.join(cls.builddir, "conf/selftest.inc")
cls.testinc_bblayers_path = os.path.join(cls.builddir,
"conf/bblayers.inc")
@@ -53,8 +65,11 @@ class OESelftestTestCase(OETestCase):
os.makedirs(cls.builddir)
builddir_conf = os.path.join(cls.builddir, 'conf')
- origdir_conf = os.path.join(cls.tc.config_paths['builddir'],
'conf')
- shutil.copytree(origdir_conf, builddir_conf)
+ os.makedirs(builddir_conf)
+ shutil.copyfile(cls.tc.config_paths['localconf_backup'],
+ os.path.join(builddir_conf, 'local.conf'))
+ shutil.copyfile(cls.tc.config_paths['bblayers_backup'],
+ os.path.join(builddir_conf, 'bblayers.conf'))
ftools.append_file(cls.localconf_path, "# added by oe-selftest
base class")
@@ -75,11 +90,24 @@ class OESelftestTestCase(OETestCase):
ftools.append_file(cls.localconf_path, "PARALLEL_MAKE?=\"-j
%d\"" %
cls.tc.loader.process_num)
+ # copy meta-selftest per class to avoid races when changing
meta-data
+ # and init git repository because some tests review the repo status
+ os.makedirs(cls.base_testlayer_path)
+ shutil.copytree(cls.orig_testlayer_path, cls.testlayer_path)
+ cls.runCmd("git init; git add *; git commit -a -m 'initial'",
+ cwd=cls.testlayer_path)
+
+ # XXX: sometimes meta-selftest isn't on bblayers at first backup
+ try:
+ cls.runCmd("bitbake-layers remove-layer %s" %
cls.orig_testlayer_path)
+ except:
+ pass
+ cls.runCmd("bitbake-layers add-layer %s" % cls.testlayer_path)
+
@classmethod
def setUpClass(cls):
super(OESelftestTestCase, cls).setUpClass()
- cls.testlayer_path = cls.tc.config_paths['testlayer_path']
cls._setUpBuildDir()
cls._track_for_cleanup = [
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
