summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/tests/setup.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/tests/setup.py b/bitbake/lib/bb/tests/setup.py
index ba2a90009d..6e9bf03654 100644
--- a/bitbake/lib/bb/tests/setup.py
+++ b/bitbake/lib/bb/tests/setup.py
@@ -148,10 +148,10 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
148 "oe-fragments": ["test-fragment-2"] 148 "oe-fragments": ["test-fragment-2"]
149 }, 149 },
150 { 150 {
151 "name": "gizmo-notemplate-with-relative-layers", 151 "name": "gizmo-notemplate-with-filerelative-layers",
152 "description": "Gizmo notemplate configuration using relative layers", 152 "description": "Gizmo notemplate configuration using filerelative layers",
153 "bb-layers": ["layerC","layerD/meta-layer"], 153 "bb-layers": ["layerC","layerD/meta-layer"],
154 "bb-layers-relative": ["layerE/meta-layer"], 154 "bb-layers-file-relative": ["layerE/meta-layer"],
155 "oe-fragments": ["test-fragment-2"] 155 "oe-fragments": ["test-fragment-2"]
156 } 156 }
157 ] 157 ]
@@ -206,12 +206,12 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
206 bblayers = f.read() 206 bblayers = f.read()
207 for l in bitbake_config["bb-layers"]: 207 for l in bitbake_config["bb-layers"]:
208 self.assertIn(os.path.join(setuppath, "layers", l), bblayers) 208 self.assertIn(os.path.join(setuppath, "layers", l), bblayers)
209 for l in bitbake_config.get("bb-layers-relative") or []: 209 for l in bitbake_config.get("bb-layers-file-relative") or []:
210 relative_layer = os.path.join( 210 filerelative_layer = os.path.join(
211 os.path.dirname(config_upstream["path"]), 211 os.path.dirname(config_upstream["path"]),
212 l, 212 l,
213 ) 213 )
214 self.assertIn(relative_layer, bblayers) 214 self.assertIn(filerelative_layer, bblayers)
215 215
216 if 'oe-fragment' in bitbake_config.keys(): 216 if 'oe-fragment' in bitbake_config.keys():
217 for f in bitbake_config["oe-fragments"]: 217 for f in bitbake_config["oe-fragments"]:
@@ -298,7 +298,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
298 'gizmo-env-passthrough', 298 'gizmo-env-passthrough',
299 'gizmo-no-fragment', 299 'gizmo-no-fragment',
300 'gadget-notemplate','gizmo-notemplate', 300 'gadget-notemplate','gizmo-notemplate',
301 'gizmo-notemplate-with-relative-layers')} 301 'gizmo-notemplate-with-filerelative-layers')}
302 } 302 }
303 for cf, v in test_configurations.items(): 303 for cf, v in test_configurations.items():
304 for c in v['buildconfigs']: 304 for c in v['buildconfigs']: