diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/buildperf/base.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 9429202dca..3b41c69ef6 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -919,7 +919,7 @@ def check_sanity(sanity_data): | |||
919 | last_tmpdir = "" | 919 | last_tmpdir = "" |
920 | last_sstate_dir = "" | 920 | last_sstate_dir = "" |
921 | last_nativelsbstr = "" | 921 | last_nativelsbstr = "" |
922 | sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info") | 922 | sanityverfile = sanity_data.expand("${TOPDIR}/cache/sanity_info") |
923 | if os.path.exists(sanityverfile): | 923 | if os.path.exists(sanityverfile): |
924 | with open(sanityverfile, 'r') as f: | 924 | with open(sanityverfile, 'r') as f: |
925 | for line in f: | 925 | for line in f: |
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 3b2fed549f..5f1805d86c 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py | |||
@@ -462,7 +462,7 @@ class BuildPerfTestCase(unittest.TestCase): | |||
462 | def rm_tmp(self): | 462 | def rm_tmp(self): |
463 | """Cleanup temporary/intermediate files and directories""" | 463 | """Cleanup temporary/intermediate files and directories""" |
464 | log.debug("Removing temporary and cache files") | 464 | log.debug("Removing temporary and cache files") |
465 | for name in ['bitbake.lock', 'conf/sanity_info', | 465 | for name in ['bitbake.lock', 'cache/sanity_info', |
466 | self.bb_vars['TMPDIR']]: | 466 | self.bb_vars['TMPDIR']]: |
467 | oe.path.remove(name, recurse=True) | 467 | oe.path.remove(name, recurse=True) |
468 | 468 | ||