Patchwork sanity: Don't make assumptions about cwd

login
register
mail settings
Submitter Richard Purdie
Date Sept. 1, 2013, 3:19 p.m.
Message ID <1378048772.1059.167.camel@ted>
Download mbox | patch
Permalink /patch/57191/
State Accepted
Commit 5894ac1f38cdbc74b8197710bd64fc79b05aec87
Headers show

Comments

Richard Purdie - Sept. 1, 2013, 3:19 p.m.
When using the recently fixed out of build directory bitbake invocations, I was
puzzled why bitbake seemed to be pausing. The reason was due to running the sanity
tests each and every time. This was due to current working directory assumptions
within the sanity test code. Fix this to use TOPDIR.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4df3ca8..feffed9 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -694,7 +694,7 @@  def check_sanity(sanity_data):
     last_sanity_version = 0
     last_tmpdir = ""
     last_sstate_dir = ""
-    sanityverfile = 'conf/sanity_info'
+    sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info")
     if os.path.exists(sanityverfile):
         with open(sanityverfile, 'r') as f:
             for line in f:
@@ -715,7 +715,8 @@  def check_sanity(sanity_data):
     else: 
         if last_sstate_dir != sstate_dir:
             status.addresult(check_sanity_sstate_dir_change(sstate_dir, sanity_data))
-    if os.path.exists("conf") and not status.messages:
+
+    if os.path.exists(os.path.dirname(sanityverfile)) and not status.messages:
         with open(sanityverfile, 'w') as f:
             f.write("SANITY_VERSION %s\n" % sanity_version) 
             f.write("TMPDIR %s\n" % tmpdir)