From d152d034840158ad18cac82db199a5e5ea2f9781 Mon Sep 17 00:00:00 2001 From: Corneliu Stoicescu Date: Thu, 6 Mar 2014 18:35:56 +0200 Subject: oe-selftest: force some values in local.conf for _sstatetests_noauto.py 1) Some values should have default values in order for tests like sstate relocation to be relevant - SSTATE_DIR needs to have default value - SSTATE_MIRRORS need to be unset (we need the sstate files to be created) - TMPDIR needs to be in default location 2) Added conf/auto.conf to list of ported files to secondary build directories (From OE-Core rev: 3b98de79e14c44e70fd72ed94493a674444bdba2) Signed-off-by: Corneliu Stoicescu Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/_sstatetests_noauto.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/_sstatetests_noauto.py index 97366d97ae..fc9ae7efb9 100644 --- a/meta/lib/oeqa/selftest/_sstatetests_noauto.py +++ b/meta/lib/oeqa/selftest/_sstatetests_noauto.py @@ -28,7 +28,17 @@ class RebuildFromSState(SStateBase): 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')) + 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')) + try: + shutil.copyfile(os.path.join(os.environ.get('BUILDDIR'), 'conf/auto.conf'), os.path.join(builddir, 'conf/auto.conf')) + except: + pass def hardlink_tree(self, src, dst): os.mkdir(dst) -- cgit v1.2.3-54-g00ecf