From da577c7d37a0e35f948370da333306aea2cef5cc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 16 Mar 2017 12:53:15 +0000 Subject: [PATCH] bitbake: tests/data: Add inactive remove override test In 2bc4d35fb32defc59cd6ed1fc87e35924c201a5c we fixed cases where an inactive remove override was influecing the value of a variable. This adds a test case for this issue. (Bitbake rev: 1ff9b3c669fa187f152de7b8b57d14c2468d926c) Signed-off-by: Richard Purdie --- bitbake/lib/bb/tests/data.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index be46ffc31b..895489e02a 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py @@ -283,6 +283,13 @@ class TestConcatOverride(unittest.TestCase): self.d.setVar("TEST_remove", "val") self.assertEqual(self.d.getVar("TEST"), "bar") + # Ensure the value is unchanged if we have an inactive remove override + # (including that whitespace is preserved) + def test_remove_inactive_override(self): + self.d.setVar("TEST", "${VAL} ${BAR} 123") + self.d.setVar("TEST_remove_inactiveoverride", "val") + self.assertEqual(self.d.getVar("TEST"), "val bar 123") + def test_doubleref_remove(self): self.d.setVar("TEST", "${VAL} ${BAR}") self.d.setVar("TEST_remove", "val")