mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
oeqa/selftest/sstate: Merge sstate test class with tests themselves
Having this base class as a separate file is just confusing. Merge with the rest of the test code. (From OE-Core rev: 977522a3b063225e22e2fd04b8265a4595606db2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
parent
4eb546cf1c
commit
a4c484b8cb
|
|
@ -9,7 +9,7 @@ import shutil
|
|||
|
||||
import oeqa.utils.ftools as ftools
|
||||
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
|
||||
from oeqa.selftest.cases.sstate import SStateBase
|
||||
from oeqa.selftest.cases.sstatetests import SStateBase
|
||||
|
||||
|
||||
class RebuildFromSState(SStateBase):
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
#
|
||||
# Copyright OpenEmbedded Contributors
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
#
|
||||
|
||||
import datetime
|
||||
import os
|
||||
import re
|
||||
|
||||
from oeqa.selftest.case import OESelftestTestCase
|
||||
from oeqa.utils.commands import get_bb_vars
|
||||
|
||||
|
||||
class SStateBase(OESelftestTestCase):
|
||||
|
||||
def setUpLocal(self):
|
||||
super(SStateBase, self).setUpLocal()
|
||||
self.temp_sstate_location = None
|
||||
needed_vars = ['SSTATE_DIR', 'NATIVELSBSTRING', 'TCLIBC', 'TUNE_ARCH',
|
||||
'TOPDIR', 'TARGET_VENDOR', 'TARGET_OS']
|
||||
bb_vars = get_bb_vars(needed_vars)
|
||||
self.sstate_path = bb_vars['SSTATE_DIR']
|
||||
self.hostdistro = bb_vars['NATIVELSBSTRING']
|
||||
self.tclibc = bb_vars['TCLIBC']
|
||||
self.tune_arch = bb_vars['TUNE_ARCH']
|
||||
self.topdir = bb_vars['TOPDIR']
|
||||
self.target_vendor = bb_vars['TARGET_VENDOR']
|
||||
self.target_os = bb_vars['TARGET_OS']
|
||||
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
|
||||
|
||||
# Creates a special sstate configuration with the option to add sstate mirrors
|
||||
def config_sstate(self, temp_sstate_location=False, add_local_mirrors=[]):
|
||||
self.temp_sstate_location = temp_sstate_location
|
||||
|
||||
if self.temp_sstate_location:
|
||||
temp_sstate_path = os.path.join(self.builddir, "temp_sstate_%s" % datetime.datetime.now().strftime('%Y%m%d%H%M%S'))
|
||||
config_temp_sstate = "SSTATE_DIR = \"%s\"" % temp_sstate_path
|
||||
self.append_config(config_temp_sstate)
|
||||
self.track_for_cleanup(temp_sstate_path)
|
||||
bb_vars = get_bb_vars(['SSTATE_DIR', 'NATIVELSBSTRING'])
|
||||
self.sstate_path = bb_vars['SSTATE_DIR']
|
||||
self.hostdistro = bb_vars['NATIVELSBSTRING']
|
||||
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
|
||||
|
||||
if add_local_mirrors:
|
||||
config_set_sstate_if_not_set = 'SSTATE_MIRRORS ?= ""'
|
||||
self.append_config(config_set_sstate_if_not_set)
|
||||
for local_mirror in add_local_mirrors:
|
||||
self.assertFalse(os.path.join(local_mirror) == os.path.join(self.sstate_path), msg='Cannot add the current sstate path as a sstate mirror')
|
||||
config_sstate_mirror = "SSTATE_MIRRORS += \"file://.* file:///%s/PATH\"" % local_mirror
|
||||
self.append_config(config_sstate_mirror)
|
||||
|
||||
# Returns a list containing sstate files
|
||||
def search_sstate(self, filename_regex, distro_specific=True, distro_nonspecific=True):
|
||||
result = []
|
||||
for root, dirs, files in os.walk(self.sstate_path):
|
||||
if distro_specific and re.search(r"%s/%s/[a-z0-9]{2}/[a-z0-9]{2}$" % (self.sstate_path, self.hostdistro), root):
|
||||
for f in files:
|
||||
if re.search(filename_regex, f):
|
||||
result.append(f)
|
||||
if distro_nonspecific and re.search(r"%s/[a-z0-9]{2}/[a-z0-9]{2}$" % self.sstate_path, root):
|
||||
for f in files:
|
||||
if re.search(filename_regex, f):
|
||||
result.append(f)
|
||||
return result
|
||||
|
|
@ -9,13 +9,69 @@ import shutil
|
|||
import glob
|
||||
import subprocess
|
||||
import tempfile
|
||||
import datetime
|
||||
import re
|
||||
|
||||
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer, get_bb_vars
|
||||
from oeqa.selftest.case import OESelftestTestCase
|
||||
|
||||
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer
|
||||
from oeqa.selftest.cases.sstate import SStateBase
|
||||
import oe
|
||||
|
||||
import bb.siggen
|
||||
|
||||
class SStateBase(OESelftestTestCase):
|
||||
|
||||
def setUpLocal(self):
|
||||
super(SStateBase, self).setUpLocal()
|
||||
self.temp_sstate_location = None
|
||||
needed_vars = ['SSTATE_DIR', 'NATIVELSBSTRING', 'TCLIBC', 'TUNE_ARCH',
|
||||
'TOPDIR', 'TARGET_VENDOR', 'TARGET_OS']
|
||||
bb_vars = get_bb_vars(needed_vars)
|
||||
self.sstate_path = bb_vars['SSTATE_DIR']
|
||||
self.hostdistro = bb_vars['NATIVELSBSTRING']
|
||||
self.tclibc = bb_vars['TCLIBC']
|
||||
self.tune_arch = bb_vars['TUNE_ARCH']
|
||||
self.topdir = bb_vars['TOPDIR']
|
||||
self.target_vendor = bb_vars['TARGET_VENDOR']
|
||||
self.target_os = bb_vars['TARGET_OS']
|
||||
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
|
||||
|
||||
# Creates a special sstate configuration with the option to add sstate mirrors
|
||||
def config_sstate(self, temp_sstate_location=False, add_local_mirrors=[]):
|
||||
self.temp_sstate_location = temp_sstate_location
|
||||
|
||||
if self.temp_sstate_location:
|
||||
temp_sstate_path = os.path.join(self.builddir, "temp_sstate_%s" % datetime.datetime.now().strftime('%Y%m%d%H%M%S'))
|
||||
config_temp_sstate = "SSTATE_DIR = \"%s\"" % temp_sstate_path
|
||||
self.append_config(config_temp_sstate)
|
||||
self.track_for_cleanup(temp_sstate_path)
|
||||
bb_vars = get_bb_vars(['SSTATE_DIR', 'NATIVELSBSTRING'])
|
||||
self.sstate_path = bb_vars['SSTATE_DIR']
|
||||
self.hostdistro = bb_vars['NATIVELSBSTRING']
|
||||
self.distro_specific_sstate = os.path.join(self.sstate_path, self.hostdistro)
|
||||
|
||||
if add_local_mirrors:
|
||||
config_set_sstate_if_not_set = 'SSTATE_MIRRORS ?= ""'
|
||||
self.append_config(config_set_sstate_if_not_set)
|
||||
for local_mirror in add_local_mirrors:
|
||||
self.assertFalse(os.path.join(local_mirror) == os.path.join(self.sstate_path), msg='Cannot add the current sstate path as a sstate mirror')
|
||||
config_sstate_mirror = "SSTATE_MIRRORS += \"file://.* file:///%s/PATH\"" % local_mirror
|
||||
self.append_config(config_sstate_mirror)
|
||||
|
||||
# Returns a list containing sstate files
|
||||
def search_sstate(self, filename_regex, distro_specific=True, distro_nonspecific=True):
|
||||
result = []
|
||||
for root, dirs, files in os.walk(self.sstate_path):
|
||||
if distro_specific and re.search(r"%s/%s/[a-z0-9]{2}/[a-z0-9]{2}$" % (self.sstate_path, self.hostdistro), root):
|
||||
for f in files:
|
||||
if re.search(filename_regex, f):
|
||||
result.append(f)
|
||||
if distro_nonspecific and re.search(r"%s/[a-z0-9]{2}/[a-z0-9]{2}$" % self.sstate_path, root):
|
||||
for f in files:
|
||||
if re.search(filename_regex, f):
|
||||
result.append(f)
|
||||
return result
|
||||
|
||||
|
||||
class SStateTests(SStateBase):
|
||||
def test_autorev_sstate_works(self):
|
||||
# Test that a git repository which changes is correctly handled by SRCREV = ${AUTOREV}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user