diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-07 13:22:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 13:07:17 +0100 |
commit | 23c8b861d1347094b8fba84f8897e0344d62e2e7 (patch) | |
tree | c31436d1546fdf8bd941ee3e62abd9e8bf286a31 | |
parent | a77d2cc81cdfeab4040888716772bf5fb6f215c2 (diff) | |
download | ast2050-yocto-poky-23c8b861d1347094b8fba84f8897e0344d62e2e7.zip ast2050-yocto-poky-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>
-rw-r--r-- | meta/lib/oeqa/selftest/bbtests.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index b301d8f..8f71a2b 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -98,6 +98,8 @@ 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\"") bitbake('-ccleanall man') result = bitbake('-c fetch man', ignore_status=True) bitbake('-ccleanall man') @@ -108,6 +110,8 @@ 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\"") data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' self.write_recipeinc('aspell', data) bitbake('-ccleanall aspell') @@ -170,6 +174,8 @@ 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_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) |