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:14:44 +0100 |
commit | 112839bebe26946b6152f1cd29248bf549a1bc54 (patch) | |
tree | db5cb32a9a0582b226733c7dd1622da6a40bda0a | |
parent | f48d1a75e148911d7e0ebbb47ea7eb250120f4cd (diff) | |
download | poky-112839bebe26946b6152f1cd29248bf549a1bc54.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)
(From OE-Core rev: c58814c910d813a761b5c0e3ba63d6fddef86cc9)
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): | |||
97 | def test_invalid_recipe_src_uri(self): | 97 | def test_invalid_recipe_src_uri(self): |
98 | data = 'SRC_URI = "file://invalid"' | 98 | data = 'SRC_URI = "file://invalid"' |
99 | self.write_recipeinc('man', data) | 99 | self.write_recipeinc('man', data) |
100 | self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") | 100 | self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" |
101 | self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") | 101 | SSTATE_DIR = \"${TOPDIR}/download-selftest\" |
102 | """) | ||
102 | bitbake('-ccleanall man') | 103 | bitbake('-ccleanall man') |
103 | result = bitbake('-c fetch man', ignore_status=True) | 104 | result = bitbake('-c fetch man', ignore_status=True) |
104 | bitbake('-ccleanall man') | 105 | bitbake('-ccleanall man') |
@@ -109,8 +110,9 @@ class BitbakeTests(oeSelfTest): | |||
109 | 110 | ||
110 | @testcase(171) | 111 | @testcase(171) |
111 | def test_rename_downloaded_file(self): | 112 | def test_rename_downloaded_file(self): |
112 | self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") | 113 | self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" |
113 | self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") | 114 | SSTATE_DIR = \"${TOPDIR}/download-selftest\" |
115 | """) | ||
114 | data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' | 116 | data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' |
115 | self.write_recipeinc('aspell', data) | 117 | self.write_recipeinc('aspell', data) |
116 | bitbake('-ccleanall aspell') | 118 | bitbake('-ccleanall aspell') |
@@ -173,8 +175,9 @@ class BitbakeTests(oeSelfTest): | |||
173 | 175 | ||
174 | @testcase(1035) | 176 | @testcase(1035) |
175 | def test_continue(self): | 177 | def test_continue(self): |
176 | self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") | 178 | self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" |
177 | self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") | 179 | SSTATE_DIR = \"${TOPDIR}/download-selftest\" |
180 | """) | ||
178 | self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) | 181 | self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) |
179 | runCmd('bitbake -c cleanall man xcursor-transparent-theme') | 182 | runCmd('bitbake -c cleanall man xcursor-transparent-theme') |
180 | result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) | 183 | result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) |