[oe-commits] Richard Purdie : oeqa/bbtests: Fix to ensure DL_DIR is set
git at git.openembedded.org
git at git.openembedded.org
Wed Jul 8 12:09:51 UTC 2015
Module: openembedded-core.git
Branch: fido
Commit: c94ba6160d5965d4d2071154b43112eb87f4c898
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c94ba6160d5965d4d2071154b43112eb87f4c898
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Jul 8 12:55:28 2015 +0100
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 at linuxfoundation.org>
---
meta/lib/oeqa/selftest/bbtests.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index 8f71a2b..b292fd3 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)
More information about the Openembedded-commits
mailing list