summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-12-04 13:42:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 14:24:43 +0000
commitf17a6937ab50452834dc85fab4e9712576e0c840 (patch)
tree96a9820a8fec0ef1e0d5f80f6993dcbd6003e30d /meta/lib/oeqa/selftest
parentc3c2cc4180118fef377b7f4ce92b920a6589cf48 (diff)
downloadast2050-yocto-poky-f17a6937ab50452834dc85fab4e9712576e0c840.zip
ast2050-yocto-poky-f17a6937ab50452834dc85fab4e9712576e0c840.tar.gz
lib/oeqa/selftest/base, scripts/oe-selftest: fix wrong remove path and do a complete cleanup at the end
The script should clean-up all the .inc files that might have been created by tests regardless of the outcome or if the script is interrupted. (currently the last test will leave a conf/selftest.inc around, even if it's not included anywhere) Also fix delete_recipeinc to actually delete what's supposed to. (From OE-Core rev: 6008745c56800e0f5f01a756be0701cebd9de4ae) Signed-off-by: Stefan Stanacar <stefanx.stanacar@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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py
index 30a71e8..c3474a3 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/meta/lib/oeqa/selftest/base.py
@@ -92,7 +92,7 @@ class oeSelfTest(unittest.TestCase):
inc_file = os.path.join(self.testlayer_path, 'recipes-test', recipe, 'test_recipe.inc')
self.log.debug("Deleting file: %s" % inc_file)
try:
- os.remove(self.testinc_path)
+ os.remove(inc_file)
except OSError as e:
if e.errno != errno.ENOENT:
raise
OpenPOWER on IntegriCloud