helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2025-12-31 13:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake-setup: tests: move duplicate code into 'check_setupdir_files'

Browse Source 
All places that called into 'check_setupdir_files' did the same
preparation step to load the upstream-config.json and then pass it
into the function.

Since the 'setuppath' is already passed into the function, and the
name and relative location of the upstream-config.json is fixed,
constructing the file path and loading the json could be done in the
function.

De-duplicate code by loading the json inside the function instead.

(Bitbake rev: 16d77c83ae3ce92ddab84d714a93fd3bb7def5e2)

Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Johannes Schneider 2025-11-05 20:06:35 +01:00 committed by Richard Purdie
parent 5de850ec01
commit 13b7a749ec
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bitbake/lib/bb/tests/setup.py
View File

@ -177,10 +177,12 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
self.git('add {}'.format(name), cwd=self.testrepopath)
self.git('commit -m "Adding {}"'.format(name), cwd=self.testrepopath)
def check_setupdir_files(self, setuppath, test_file_content, json_config):
def check_setupdir_files(self, setuppath, test_file_content):
with open(os.path.join(setuppath, 'config', "config-upstream.json")) as f:
config_upstream = json.load(f)
with open(os.path.join(setuppath, 'layers', 'test-repo', 'test-file')) as f:
self.assertEqual(f.read(), test_file_content)
bitbake_config = json_config["bitbake-config"]
bitbake_config = config_upstream["bitbake-config"]
bb_build_path = os.path.join(setuppath, 'build')
bb_conf_path = os.path.join(bb_build_path, 'conf')
self.assertTrue(os.path.exists(os.path.join(bb_build_path, 'init-build-env')))
@ -198,7 +200,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
for l in bitbake_config["bb-layers"]:
if l.startswith('{THISDIR}/'):
thisdir_layer = os.path.join(
os.path.dirname(json_config["path"]),
os.path.dirname(config_upstream["path"]),
l.removeprefix("{THISDIR}/"),
)
self.assertIn(thisdir_layer, bblayers)
@ -296,9 +298,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
for c in v['buildconfigs']:
out = self.runbbsetup("init --non-interactive {} {}".format(v['cmdline'], c))
setuppath = os.path.join(self.tempdir, 'bitbake-builds', '{}-{}'.format(cf, c))
with open(os.path.join(setuppath, 'config', "config-upstream.json")) as f:
config_upstream = json.load(f)
self.check_setupdir_files(setuppath, test_file_content, config_upstream)
self.check_setupdir_files(setuppath, test_file_content)
os.environ['BBPATH'] = os.path.join(setuppath, 'build')
out = self.runbbsetup("status")
self.assertIn("Configuration in {} has not changed".format(setuppath), out[0])
@ -327,9 +327,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
if c in ('gadget', 'gizmo'):
self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(setuppath), out[0])
self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0])
with open(os.path.join(setuppath, 'config', "config-upstream.json")) as f:
config_upstream = json.load(f)
self.check_setupdir_files(setuppath, test_file_content, config_upstream)
self.check_setupdir_files(setuppath, test_file_content)
# make a new branch in the test layer repo, change a file on that branch,
# make a new commit, update the top level json config to refer to that branch,
@ -353,6 +351,4 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
if c in ('gadget', 'gizmo'):
self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(setuppath), out[0])
self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0])
with open(os.path.join(setuppath, 'config', "config-upstream.json")) as f:
config_upstream = json.load(f)
self.check_setupdir_files(setuppath, test_file_content, config_upstream)
self.check_setupdir_files(setuppath, test_file_content)