summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/lib/oeqa/buildperf/base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 9d0c784032..936fe913b4 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -927,7 +927,7 @@ def check_sanity(sanity_data):
927 last_tmpdir = "" 927 last_tmpdir = ""
928 last_sstate_dir = "" 928 last_sstate_dir = ""
929 last_nativelsbstr = "" 929 last_nativelsbstr = ""
930 sanityverfile = sanity_data.expand("${TOPDIR}/conf/sanity_info") 930 sanityverfile = sanity_data.expand("${TOPDIR}/cache/sanity_info")
931 if os.path.exists(sanityverfile): 931 if os.path.exists(sanityverfile):
932 with open(sanityverfile, 'r') as f: 932 with open(sanityverfile, 'r') as f:
933 for line in f: 933 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