summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/selftest/base.py2
-rwxr-xr-xscripts/oe-selftest12
2 files changed, 13 insertions, 1 deletions
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):
92 inc_file = os.path.join(self.testlayer_path, 'recipes-test', recipe, 'test_recipe.inc') 92 inc_file = os.path.join(self.testlayer_path, 'recipes-test', recipe, 'test_recipe.inc')
93 self.log.debug("Deleting file: %s" % inc_file) 93 self.log.debug("Deleting file: %s" % inc_file)
94 try: 94 try:
95 os.remove(self.testinc_path) 95 os.remove(inc_file)
96 except OSError as e: 96 except OSError as e:
97 if e.errno != errno.ENOENT: 97 if e.errno != errno.ENOENT:
98 raise 98 raise
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index db42e73470..29fe0100de 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -97,6 +97,17 @@ def remove_include():
97 ftools.remove_from_file(os.path.join(builddir, "conf/local.conf"), \ 97 ftools.remove_from_file(os.path.join(builddir, "conf/local.conf"), \
98 "#include added by oe-selftest.py\ninclude selftest.inc") 98 "#include added by oe-selftest.py\ninclude selftest.inc")
99 99
100
101def remove_inc_files():
102 try:
103 os.remove(os.path.join(os.environ.get("BUILDDIR"), "conf/selftest.inc"))
104 for root, _, files in os.walk(get_test_layer()):
105 for f in files:
106 if f == 'test_recipe.inc':
107 os.remove(os.path.join(root, f))
108 except OSError as e:
109 pass
110
100def get_tests(): 111def get_tests():
101 testslist = [] 112 testslist = []
102 for x in sys.argv[1:]: 113 for x in sys.argv[1:]:
@@ -145,4 +156,5 @@ if __name__ == "__main__":
145 traceback.print_exc(5) 156 traceback.print_exc(5)
146 finally: 157 finally:
147 remove_include() 158 remove_include()
159 remove_inc_files()
148 sys.exit(ret) 160 sys.exit(ret)