diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/tests/data.py | 46 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/parse.py | 2 |
2 files changed, 24 insertions, 24 deletions
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index add1b13600..7f1d3ffbbc 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py | |||
@@ -281,7 +281,7 @@ class TestConcatOverride(unittest.TestCase): | |||
281 | # (including that whitespace is preserved) | 281 | # (including that whitespace is preserved) |
282 | def test_remove_inactive_override(self): | 282 | def test_remove_inactive_override(self): |
283 | self.d.setVar("TEST", "${VAL} ${BAR} 123") | 283 | self.d.setVar("TEST", "${VAL} ${BAR} 123") |
284 | self.d.setVar("TEST:remove_inactiveoverride", "val") | 284 | self.d.setVar("TEST:remove:inactiveoverride", "val") |
285 | self.assertEqual(self.d.getVar("TEST"), "val bar 123") | 285 | self.assertEqual(self.d.getVar("TEST"), "val bar 123") |
286 | 286 | ||
287 | def test_doubleref_remove(self): | 287 | def test_doubleref_remove(self): |
@@ -329,35 +329,35 @@ class TestOverrides(unittest.TestCase): | |||
329 | self.assertEqual(self.d.getVar("TEST"), "testvalue") | 329 | self.assertEqual(self.d.getVar("TEST"), "testvalue") |
330 | 330 | ||
331 | def test_one_override(self): | 331 | def test_one_override(self): |
332 | self.d.setVar("TEST_bar", "testvalue2") | 332 | self.d.setVar("TEST:bar", "testvalue2") |
333 | self.assertEqual(self.d.getVar("TEST"), "testvalue2") | 333 | self.assertEqual(self.d.getVar("TEST"), "testvalue2") |
334 | 334 | ||
335 | def test_one_override_unset(self): | 335 | def test_one_override_unset(self): |
336 | self.d.setVar("TEST2_bar", "testvalue2") | 336 | self.d.setVar("TEST2:bar", "testvalue2") |
337 | 337 | ||
338 | self.assertEqual(self.d.getVar("TEST2"), "testvalue2") | 338 | self.assertEqual(self.d.getVar("TEST2"), "testvalue2") |
339 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST2', 'OVERRIDES', 'TEST2_bar']) | 339 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST2', 'OVERRIDES', 'TEST2:bar']) |
340 | 340 | ||
341 | def test_multiple_override(self): | 341 | def test_multiple_override(self): |
342 | self.d.setVar("TEST_bar", "testvalue2") | 342 | self.d.setVar("TEST:bar", "testvalue2") |
343 | self.d.setVar("TEST_local", "testvalue3") | 343 | self.d.setVar("TEST:local", "testvalue3") |
344 | self.d.setVar("TEST_foo", "testvalue4") | 344 | self.d.setVar("TEST:foo", "testvalue4") |
345 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") | 345 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") |
346 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST_foo', 'OVERRIDES', 'TEST_bar', 'TEST_local']) | 346 | self.assertCountEqual(list(self.d.keys()), ['TEST', 'TEST:foo', 'OVERRIDES', 'TEST:bar', 'TEST:local']) |
347 | 347 | ||
348 | def test_multiple_combined_overrides(self): | 348 | def test_multiple_combined_overrides(self): |
349 | self.d.setVar("TEST_local_foo_bar", "testvalue3") | 349 | self.d.setVar("TEST:local:foo:bar", "testvalue3") |
350 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") | 350 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") |
351 | 351 | ||
352 | def test_multiple_overrides_unset(self): | 352 | def test_multiple_overrides_unset(self): |
353 | self.d.setVar("TEST2_local_foo_bar", "testvalue3") | 353 | self.d.setVar("TEST2:local:foo:bar", "testvalue3") |
354 | self.assertEqual(self.d.getVar("TEST2"), "testvalue3") | 354 | self.assertEqual(self.d.getVar("TEST2"), "testvalue3") |
355 | 355 | ||
356 | def test_keyexpansion_override(self): | 356 | def test_keyexpansion_override(self): |
357 | self.d.setVar("LOCAL", "local") | 357 | self.d.setVar("LOCAL", "local") |
358 | self.d.setVar("TEST_bar", "testvalue2") | 358 | self.d.setVar("TEST:bar", "testvalue2") |
359 | self.d.setVar("TEST_${LOCAL}", "testvalue3") | 359 | self.d.setVar("TEST:${LOCAL}", "testvalue3") |
360 | self.d.setVar("TEST_foo", "testvalue4") | 360 | self.d.setVar("TEST:foo", "testvalue4") |
361 | bb.data.expandKeys(self.d) | 361 | bb.data.expandKeys(self.d) |
362 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") | 362 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") |
363 | 363 | ||
@@ -368,31 +368,31 @@ class TestOverrides(unittest.TestCase): | |||
368 | self.assertEqual(self.d.getVar("ALTERNATIVE:lib32-ncurses-tools"), "a") | 368 | self.assertEqual(self.d.getVar("ALTERNATIVE:lib32-ncurses-tools"), "a") |
369 | 369 | ||
370 | def test_underscore_override(self): | 370 | def test_underscore_override(self): |
371 | self.d.setVar("TEST_bar", "testvalue2") | 371 | self.d.setVar("TEST:bar", "testvalue2") |
372 | self.d.setVar("TEST_some_val", "testvalue3") | 372 | self.d.setVar("TEST:some_val", "testvalue3") |
373 | self.d.setVar("TEST_foo", "testvalue4") | 373 | self.d.setVar("TEST:foo", "testvalue4") |
374 | self.d.setVar("OVERRIDES", "foo:bar:some_val") | 374 | self.d.setVar("OVERRIDES", "foo:bar:some_val") |
375 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") | 375 | self.assertEqual(self.d.getVar("TEST"), "testvalue3") |
376 | 376 | ||
377 | def test_remove_with_override(self): | 377 | def test_remove_with_override(self): |
378 | self.d.setVar("TEST_bar", "testvalue2") | 378 | self.d.setVar("TEST:bar", "testvalue2") |
379 | self.d.setVar("TEST_some_val", "testvalue3 testvalue5") | 379 | self.d.setVar("TEST:some_val", "testvalue3 testvalue5") |
380 | self.d.setVar("TEST_some_val:remove", "testvalue3") | 380 | self.d.setVar("TEST:some_val:remove", "testvalue3") |
381 | self.d.setVar("TEST_foo", "testvalue4") | 381 | self.d.setVar("TEST:foo", "testvalue4") |
382 | self.d.setVar("OVERRIDES", "foo:bar:some_val") | 382 | self.d.setVar("OVERRIDES", "foo:bar:some_val") |
383 | self.assertEqual(self.d.getVar("TEST"), " testvalue5") | 383 | self.assertEqual(self.d.getVar("TEST"), " testvalue5") |
384 | 384 | ||
385 | def test_append_and_override_1(self): | 385 | def test_append_and_override_1(self): |
386 | self.d.setVar("TEST:append", "testvalue2") | 386 | self.d.setVar("TEST:append", "testvalue2") |
387 | self.d.setVar("TEST_bar", "testvalue3") | 387 | self.d.setVar("TEST:bar", "testvalue3") |
388 | self.assertEqual(self.d.getVar("TEST"), "testvalue3testvalue2") | 388 | self.assertEqual(self.d.getVar("TEST"), "testvalue3testvalue2") |
389 | 389 | ||
390 | def test_append_and_override_2(self): | 390 | def test_append_and_override_2(self): |
391 | self.d.setVar("TEST:append_bar", "testvalue2") | 391 | self.d.setVar("TEST:append:bar", "testvalue2") |
392 | self.assertEqual(self.d.getVar("TEST"), "testvaluetestvalue2") | 392 | self.assertEqual(self.d.getVar("TEST"), "testvaluetestvalue2") |
393 | 393 | ||
394 | def test_append_and_override_3(self): | 394 | def test_append_and_override_3(self): |
395 | self.d.setVar("TEST_bar:append", "testvalue2") | 395 | self.d.setVar("TEST:bar:append", "testvalue2") |
396 | self.assertEqual(self.d.getVar("TEST"), "testvalue2") | 396 | self.assertEqual(self.d.getVar("TEST"), "testvalue2") |
397 | 397 | ||
398 | # Test an override with _<numeric> in it based on a real world OE issue | 398 | # Test an override with _<numeric> in it based on a real world OE issue |
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py index 02a5c4952a..1b6b6d412e 100644 --- a/bitbake/lib/bb/tests/parse.py +++ b/bitbake/lib/bb/tests/parse.py | |||
@@ -144,7 +144,7 @@ PN = "bc" | |||
144 | 144 | ||
145 | 145 | ||
146 | classextend = """ | 146 | classextend = """ |
147 | VAR_var_override1 = "B" | 147 | VAR_var:override1 = "B" |
148 | EXTRA = ":override1" | 148 | EXTRA = ":override1" |
149 | OVERRIDES = "nothing${EXTRA}" | 149 | OVERRIDES = "nothing${EXTRA}" |
150 | 150 | ||