From 9800b4d9ffda22466066ab1d301e4730e61726e0 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 12 Aug 2016 14:35:54 +0300 Subject: oeqa.buildperf: use oe.path.remove() Drop the self-baked force_rm() method. (From OE-Core rev: c86bf80abd87acb0da5860806822c64ec9dee089) Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/buildperf/test_basic.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/lib/oeqa/buildperf/test_basic.py') 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 -- cgit v1.2.3-54-g00ecf