summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-08-12 14:35:54 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:27 +0100
commitc86bf80abd87acb0da5860806822c64ec9dee089 (patch)
tree122696cc6564003987df9c95fd0da9d77e8b6619
parent240f6e7366c8a9ea830e531d307dd2e27a61a6bd (diff)
downloadopenembedded-core-contrib-c86bf80abd87acb0da5860806822c64ec9dee089.tar.gz
openembedded-core-contrib-c86bf80abd87acb0da5860806822c64ec9dee089.tar.bz2
openembedded-core-contrib-c86bf80abd87acb0da5860806822c64ec9dee089.zip
oeqa.buildperf: use oe.path.remove()
Drop the self-baked force_rm() method. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/buildperf/base.py15
-rw-r--r--meta/lib/oeqa/buildperf/test_basic.py5
2 files changed, 7 insertions, 13 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index fe18181f2b..c1dc86e5db 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -23,6 +23,7 @@ import unittest
from datetime import datetime, timedelta
from functools import partial
+import oe.path
from oeqa.utils.commands import CommandError, runCmd, get_bb_vars
from oeqa.utils.git import GitError, GitRepo
@@ -297,29 +298,21 @@ class BuildPerfTestCase(unittest.TestCase):
shutil.move(self.bb_vars['BUILDSTATS_BASE'],
os.path.join(self.out_dir, 'buildstats-' + self.name))
- @staticmethod
- def force_rm(path):
- """Equivalent of 'rm -rf'"""
- if os.path.isfile(path) or os.path.islink(path):
- os.unlink(path)
- elif os.path.isdir(path):
- shutil.rmtree(path)
-
def rm_tmp(self):
"""Cleanup temporary/intermediate files and directories"""
log.debug("Removing temporary and cache files")
for name in ['bitbake.lock', 'conf/sanity_info',
self.bb_vars['TMPDIR']]:
- self.force_rm(name)
+ oe.path.remove(name, recurse=True)
def rm_sstate(self):
"""Remove sstate directory"""
log.debug("Removing sstate-cache")
- self.force_rm(self.bb_vars['SSTATE_DIR'])
+ oe.path.remove(self.bb_vars['SSTATE_DIR'], recurse=True)
def rm_cache(self):
"""Drop bitbake caches"""
- self.force_rm(self.bb_vars['PERSISTENT_DIR'])
+ oe.path.remove(self.bb_vars['PERSISTENT_DIR'], recurse=True)
@staticmethod
def sync():
diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py
index b8bec6d6f2..9310f3d86a 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -13,6 +13,7 @@
import os
import shutil
+import oe.path
from oeqa.buildperf import BuildPerfTestCase
from oeqa.utils.commands import get_bb_vars
@@ -85,11 +86,11 @@ class Test3(BuildPerfTestCase):
"""Parsing time metrics (bitbake -p)"""
# Drop all caches and parse
self.rm_cache()
- self.force_rm(os.path.join(self.bb_vars['TMPDIR'], 'cache'))
+ oe.path.remove(os.path.join(self.bb_vars['TMPDIR'], 'cache'), True)
self.measure_cmd_resources(['bitbake', '-p'], 'parse_1',
'bitbake -p (no caches)')
# Drop tmp/cache
- self.force_rm(os.path.join(self.bb_vars['TMPDIR'], 'cache'))
+ oe.path.remove(os.path.join(self.bb_vars['TMPDIR'], 'cache'), True)
self.measure_cmd_resources(['bitbake', '-p'], 'parse_2',
'bitbake -p (no tmp/cache)')
# Parse with fully cached data