aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 12:55:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 13:03:07 +0100
commit50a37ee563d9003e21bfb9280f184cd81c62e9bf (patch)
treeecc88fa5fa87d537d833f3212219db1d3494ba46
parentdf6ddc4bf9795212fda87f9d401893eb254074da (diff)
downloadopenembedded-core-contrib-50a37ee563d9003e21bfb9280f184cd81c62e9bf.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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index ffe0ea5d63..7df6b2f1c5 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -98,8 +98,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')
@@ -110,8 +111,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')
@@ -174,8 +176,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)