summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 16:19:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 16:25:13 +0100
commit1cdc1b37b840bda961258cf2bfb2f75331bdb310 (patch)
tree86b702f9a7e51034b150492f7fa6a20286b8cb60 /meta/classes
parent6a39835af2b2b3c7797fe05479341d71a3f3aaf6 (diff)
downloadopenembedded-core-1cdc1b37b840bda961258cf2bfb2f75331bdb310.tar.gz
openembedded-core-1cdc1b37b840bda961258cf2bfb2f75331bdb310.tar.bz2
openembedded-core-1cdc1b37b840bda961258cf2bfb2f75331bdb310.zip
sanity: Don't make assumptions about cwd
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4df3ca8001..feffed9431 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)