[OE-core] [PATCH] oe-selftest : Unset SANITY_TESTED_DISTROS to avoid warnings on execution

jose.perez.carranza at linux.intel.com jose.perez.carranza at linux.intel.com
Mon Apr 24 14:33:47 UTC 2017


From: Jose Perez Carranza <jose.perez.carranza at linux.intel.com>

Unsetting SANITY_TESTED_DISTROS is required to avoid warnings that are
treated like failures by oe-selftest suite.

[YOCTO #11401]

Signed-off-by: Jose Perez Carranza <jose.perez.carranza at linux.intel.com>
---
 scripts/oe-selftest | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 52366b1c8d..8c72b8c601 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -151,14 +151,24 @@ def preflight_check():
         return False
 
     if get_bb_var("SANITY_TESTED_DISTROS"):
-        log.error("Please unset SANITY_TESTED_DISTROS in order to run oe-selftest")
-        return False
+        log.info("Unsetting SANITY_TESTED_DISTROS in order to run oe-selftest")
+        ftools.append_file(os.path.join(builddir, "conf/local.conf"), \
+                           "\n#Unset SANITY_TESTED_DISTROS added by oe-selftest.py\nSANITY_TESTED_DISTROS=''")
 
     log.info("Running bitbake -p")
     runCmd("bitbake -p")
 
     return True
 
+def remove_variables():
+   if "#Unset SANITY_TESTED_DISTROS added by oe-selftest.py" \
+       in ftools.read_file(os.path.join(builddir, "conf/local.conf")):
+           log.info("Removing SANITY_TESTED_DISTROS from local.conf")
+           ftools.remove_from_file(os.path.join(builddir, "conf/local.conf"), \
+                   "\n#Unset SANITY_TESTED_DISTROS added by oe-selftest.py\nSANITY_TESTED_DISTROS=''")
+
+
+
 def add_include():
     global builddir
     if "#include added by oe-selftest.py" \
@@ -811,4 +821,5 @@ if __name__ == "__main__":
     finally:
         remove_include()
         remove_inc_files()
+        remove_variables()
     sys.exit(ret)
-- 
2.11.0




More information about the Openembedded-core mailing list