summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-07 13:22:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 13:07:17 +0100
commit23c8b861d1347094b8fba84f8897e0344d62e2e7 (patch)
treec31436d1546fdf8bd941ee3e62abd9e8bf286a31 /meta
parenta77d2cc81cdfeab4040888716772bf5fb6f215c2 (diff)
downloadpoky-23c8b861d1347094b8fba84f8897e0344d62e2e7.tar.gz
oeqa/bbtests: Fix race over DL_DIR and SSTATE_DIR
Running "-c cleanall" on shared DL_DIR and SSTATE_DIR is antisocial. It leads to hard to debug races where we wonder why files disappear and reappear from those directories. Fix this by using a specific set of directories for these tests. This avoids a long standing bug on the autobuilder where aspell and man sources would disappear. [YOCTO #6276] (From OE-Core rev: 6b089c4a79dc3aae00c8a6e7ab0f6ba4b4b5f138) (From OE-Core rev: f1447c256e027553442cf507e217323f7868000c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index b301d8f819..8f71a2b29f 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -98,6 +98,8 @@ 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\"")
102 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"")
101 bitbake('-ccleanall man') 103 bitbake('-ccleanall man')
102 result = bitbake('-c fetch man', ignore_status=True) 104 result = bitbake('-c fetch man', ignore_status=True)
103 bitbake('-ccleanall man') 105 bitbake('-ccleanall man')
@@ -108,6 +110,8 @@ class BitbakeTests(oeSelfTest):
108 110
109 @testcase(171) 111 @testcase(171)
110 def test_rename_downloaded_file(self): 112 def test_rename_downloaded_file(self):
113 self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"")
114 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"")
111 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' 115 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"'
112 self.write_recipeinc('aspell', data) 116 self.write_recipeinc('aspell', data)
113 bitbake('-ccleanall aspell') 117 bitbake('-ccleanall aspell')
@@ -170,6 +174,8 @@ class BitbakeTests(oeSelfTest):
170 174
171 @testcase(1035) 175 @testcase(1035)
172 def test_continue(self): 176 def test_continue(self):
177 self.write_config("DL_DIR = \"${TOPDIR}/download-selftest\"")
178 self.write_config("SSTATE_DIR = \"${TOPDIR}/download-selftest\"")
173 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) 179 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
174 runCmd('bitbake -c cleanall man xcursor-transparent-theme') 180 runCmd('bitbake -c cleanall man xcursor-transparent-theme')
175 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) 181 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True)