diff options
author | Ross Burton <ross.burton@intel.com> | 2015-10-16 11:44:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 22:56:07 +0100 |
commit | 2ac34d2a199480eaf0bc4401a4616dc5b54e37b4 (patch) | |
tree | 3654f67875b0acedc7840a071b98770428bbfdb2 /meta/lib/oeqa/selftest | |
parent | a66ed339d924d47bdaef5cf31ca888af3b6b78c6 (diff) | |
download | poky-2ac34d2a199480eaf0bc4401a4616dc5b54e37b4.tar.gz |
oeqa/selftest: clean up selftest.inc in teardown
Test cases may want to do call bitbake in setUpClass() but at that point the
previous selftest.inc is still present which could change the build
configuration and result in any built artifacts being removed in the next
bitbake invocation as part of the sysroot clean up.
Resolve this by cleaning selftest.inc in the tearDown, the clean in setUp should
be considered a safety net.
(From OE-Core rev: 573bd03a7844a5ad762533f65f41214df31cd197)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py index b2faa661e5..9bddc23f87 100644 --- a/meta/lib/oeqa/selftest/base.py +++ b/meta/lib/oeqa/selftest/base.py | |||
@@ -31,7 +31,7 @@ class oeSelfTest(unittest.TestCase): | |||
31 | self.testinc_bblayers_path = os.path.join(self.builddir, "conf/bblayers.inc") | 31 | self.testinc_bblayers_path = os.path.join(self.builddir, "conf/bblayers.inc") |
32 | self.testlayer_path = oeSelfTest.testlayer_path | 32 | self.testlayer_path = oeSelfTest.testlayer_path |
33 | self._extra_tear_down_commands = [] | 33 | self._extra_tear_down_commands = [] |
34 | self._track_for_cleanup = [] | 34 | self._track_for_cleanup = [self.testinc_path] |
35 | super(oeSelfTest, self).__init__(methodName) | 35 | super(oeSelfTest, self).__init__(methodName) |
36 | 36 | ||
37 | def setUp(self): | 37 | def setUp(self): |