summaryrefslogtreecommitdiffstats
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:07:17 +0100
commite4453c98bd9ebad28be342ad66323eeb44180626 (patch)
tree7b868227f4e32cad3c224c4afa14792f0ed64e60
parent23c8b861d1347094b8fba84f8897e0344d62e2e7 (diff)
downloadpoky-e4453c98bd9ebad28be342ad66323eeb44180626.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.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 8f71a2b29f..b292fd3852 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -98,8 +98,9 @@ class BitbakeTests(oeSelfTest):
98 def test_invalid_recipe_src_uri(self): 98 def test_invalid_recipe_src_uri(self):
99 data = 'SRC_URI = "file://invalid"' 99 data = 'SRC_URI = "file://invalid"'
100 self.write_recipeinc('man', data) 100 self.write_recipeinc('man', data)
101 self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") 101 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
102 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") 102SSTATE_DIR = \"${TOPDIR}/download-selftest\"
103""")
103 bitbake('-ccleanall man') 104 bitbake('-ccleanall man')
104 result = bitbake('-c fetch man', ignore_status=True) 105 result = bitbake('-c fetch man', ignore_status=True)
105 bitbake('-ccleanall man') 106 bitbake('-ccleanall man')
@@ -110,8 +111,9 @@ class BitbakeTests(oeSelfTest):
110 111
111 @testcase(171) 112 @testcase(171)
112 def test_rename_downloaded_file(self): 113 def test_rename_downloaded_file(self):
113 self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") 114 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
114 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") 115SSTATE_DIR = \"${TOPDIR}/download-selftest\"
116""")
115 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' 117 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"'
116 self.write_recipeinc('aspell', data) 118 self.write_recipeinc('aspell', data)
117 bitbake('-ccleanall aspell') 119 bitbake('-ccleanall aspell')
@@ -174,8 +176,9 @@ class BitbakeTests(oeSelfTest):
174 176
175 @testcase(1035) 177 @testcase(1035)
176 def test_continue(self): 178 def test_continue(self):
177 self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"") 179 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
178 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"") 180SSTATE_DIR = \"${TOPDIR}/download-selftest\"
181""")
179 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) 182 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
180 runCmd('bitbake -c cleanall man xcursor-transparent-theme') 183 runCmd('bitbake -c cleanall man xcursor-transparent-theme')
181 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) 184 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True)