From 3e6746aa1df6e7eba8b191c27bc8933bd35e4201 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 28 Apr 2011 15:31:19 -0700 Subject: sanity.bbclass: pass the data object to the less frequent test harnesses By passing the data object to the less frequently run test harnesses (check_sanity_tmpdir_change(), check_sanity_sstate_dir_change() and check_sanity_version_change()) we can run tests against BitBake data here too. (From OE-Core rev: 7df8376c28d991dd07c0915d3ccade4cf51c2fee) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta/classes/sanity.bbclass') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index d296c861b2..720777a399 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -21,7 +21,7 @@ def check_conf_exists(fn, data): return True return False -def check_sanity_sstate_dir_change(sstate_dir): +def check_sanity_sstate_dir_change(sstate_dir, data): # Sanity checks to be done when the value of SSTATE_DIR changes # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) @@ -30,14 +30,14 @@ def check_sanity_sstate_dir_change(sstate_dir): testmsg = check_create_long_filename(sstate_dir, "SSTATE_DIR") return testmsg -def check_sanity_tmpdir_change(tmpdir): +def check_sanity_tmpdir_change(tmpdir, data): # Sanity checks to be done when the value of TMPDIR changes # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS) testmsg = check_create_long_filename(tmpdir, "TMPDIR") return testmsg -def check_sanity_version_change(): +def check_sanity_version_change(data): # Sanity checks to be done when SANITY_VERSION changes return "" @@ -266,14 +266,14 @@ def check_sanity(e): sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1) if last_sanity_version < sanity_version: - messages = messages + check_sanity_version_change() - messages = messages + check_sanity_tmpdir_change(tmpdir) - messages = messages + check_sanity_sstate_dir_change(sstate_dir) + messages = messages + check_sanity_version_change(e.data) + messages = messages + check_sanity_tmpdir_change(tmpdir, e.data) + messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data) else: if last_tmpdir != tmpdir: - messages = messages + check_sanity_tmpdir_change(tmpdir) + messages = messages + check_sanity_tmpdir_change(tmpdir, e.data) if last_sstate_dir != sstate_dir: - messages = messages + check_sanity_sstate_dir_change(sstate_dir) + messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data) if os.path.exists("conf"): f = file(sanityverfile, 'w') -- cgit v1.2.3-54-g00ecf