diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 12:55:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-26 09:08:49 +0100 |
| commit | c58814c910d813a761b5c0e3ba63d6fddef86cc9 (patch) | |
| tree | bf690d140cec322b8945c878aa8b0b3b01970f6d | |
| parent | e4434982e0d2c086ee946d3742c257daf31e8bfd (diff) | |
| download | openembedded-core-c58814c910d813a761b5c0e3ba63d6fddef86cc9.tar.gz | |
oeqa/bbtests: Fix to ensure DL_DIR is set
write_config overwrites the config rather than appends to it, so
ensure we write both variables in one go.
(From OE-Core rev: c94ba6160d5965d4d2071154b43112eb87f4c898)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/bbtests.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index c4d6e80bcd..66988c4303 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -97,8 +97,9 @@ class BitbakeTests(oeSelfTest): def test_invalid_recipe_src_uri(self): data = 'SRC_URI = "file://invalid"' self.write_recipeinc('man', data) - self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") - self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") + self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" +SSTATE_DIR = \"${TOPDIR}/download-selftest\" +""") bitbake('-ccleanall man') result = bitbake('-c fetch man', ignore_status=True) bitbake('-ccleanall man') @@ -109,8 +110,9 @@ class BitbakeTests(oeSelfTest): @testcase(171) def test_rename_downloaded_file(self): - self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") - self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") + self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" +SSTATE_DIR = \"${TOPDIR}/download-selftest\" +""") data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' self.write_recipeinc('aspell', data) bitbake('-ccleanall aspell') @@ -173,8 +175,9 @@ class BitbakeTests(oeSelfTest): @testcase(1035) def test_continue(self): - self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") - self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") + self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" +SSTATE_DIR = \"${TOPDIR}/download-selftest\" +""") self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) runCmd('bitbake -c cleanall man xcursor-transparent-theme') result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) |