summaryrefslogtreecommitdiffstats
path: root/scripts/oe-selftest
diff options
context:
space:
mode:
authorDaniel Istrate <daniel.alexandrux.istrate@intel.com>2015-06-29 18:31:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-07 23:56:22 +0100
commitcf7bf27f565b34fdcd2caa25aaef068c0970965e (patch)
tree4de4307fa2330c997aeeb533894df90e5146b1e1 /scripts/oe-selftest
parent2a9009583fd498df94a55f21a149e302180f19cc (diff)
downloadopenembedded-core-cf7bf27f565b34fdcd2caa25aaef068c0970965e.tar.gz
openembedded-core-cf7bf27f565b34fdcd2caa25aaef068c0970965e.tar.bz2
openembedded-core-cf7bf27f565b34fdcd2caa25aaef068c0970965e.zip
scripts/oe-selftest: Added mechanism for including/removing bblayers.inc
When oe-selftest starts it includes bblayers.inc into bblayers.conf When oe-selftest ends it deletes bblayers.inc and the included line from bblayers.conf Signed-off-by: Daniel Istrate <daniel.alexandrux.istrate@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/oe-selftest')
-rwxr-xr-xscripts/oe-selftest16
1 files changed, 15 insertions, 1 deletions
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index fd58a66123..fa6245a3a6 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -100,6 +100,11 @@ def add_include():
ftools.append_file(os.path.join(builddir, "conf/local.conf"), \
"\n#include added by oe-selftest.py\ninclude selftest.inc")
+ if "#include added by oe-selftest.py" \
+ not in ftools.read_file(os.path.join(builddir, "conf/bblayers.conf")):
+ log.info("Adding: \"include bblayers.inc\" in bblayers.conf")
+ ftools.append_file(os.path.join(builddir, "conf/bblayers.conf"), \
+ "\n#include added by oe-selftest.py\ninclude bblayers.inc")
def remove_include():
builddir = os.environ.get("BUILDDIR")
@@ -111,6 +116,11 @@ def remove_include():
ftools.remove_from_file(os.path.join(builddir, "conf/local.conf"), \
"#include added by oe-selftest.py\ninclude selftest.inc")
+ if "#include added by oe-selftest.py" \
+ in ftools.read_file(os.path.join(builddir, "conf/bblayers.conf")):
+ log.info("Removing the include from bblayers.conf")
+ ftools.remove_from_file(os.path.join(builddir, "conf/bblayers.conf"), \
+ "#include added by oe-selftest.py\ninclude bblayers.inc")
def remove_inc_files():
try:
@@ -122,6 +132,11 @@ def remove_inc_files():
except (AttributeError, OSError,) as e: # AttributeError may happen if BUILDDIR is not set
pass
+ try:
+ os.remove(os.path.join(os.environ.get("BUILDDIR"), "conf/bblayers.inc"))
+ except:
+ pass
+
def get_tests(exclusive_modules=[], include_hidden=False):
testslist = []
for x in exclusive_modules:
@@ -167,7 +182,6 @@ def main():
print e
pass
-
if args.run_tests or args.run_all_tests:
if not preflight_check():
return 1