mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-27 03:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/bbtests: Fix to ensure DL_DIR is set

Browse Source 
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>
This commit is contained in:
Richard Purdie
2015-07-08 12:55:28 +01:00
parent f48d1a75e1
commit 112839bebe
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
meta/lib/oeqa/selftest/bbtests.py
View File

@@ -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)