From 6008745c56800e0f5f01a756be0701cebd9de4ae 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. Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- scripts/oe-selftest | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'scripts') 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(): ftools.remove_from_file(os.path.join(builddir, "conf/local.conf"), \ "#include added by oe-selftest.py\ninclude selftest.inc") + +def remove_inc_files(): + try: + os.remove(os.path.join(os.environ.get("BUILDDIR"), "conf/selftest.inc")) + for root, _, files in os.walk(get_test_layer()): + for f in files: + if f == 'test_recipe.inc': + os.remove(os.path.join(root, f)) + except OSError as e: + pass + def get_tests(): testslist = [] for x in sys.argv[1:]: @@ -145,4 +156,5 @@ if __name__ == "__main__": traceback.print_exc(5) finally: remove_include() + remove_inc_files() sys.exit(ret) -- cgit 1.2.3-korg