From f17a6937ab50452834dc85fab4e9712576e0c840 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Wed, 4 Dec 2013 13:42:58 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib/oeqa/selftest/base.py') diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py index 30a71e886f..c3474a3da6 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 -- cgit v1.2.3-54-g00ecf