aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-10-05 16:29:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 14:38:24 +0100
commitdadb84936b3672dcf07e5ab8226158136762801f (patch)
tree18afa6aadbefe099fa915ce5c974f06e2391f279
parentd408b79dba47e4392a9d13aff1660a1e483a765c (diff)
downloadopenembedded-core-contrib-dadb84936b3672dcf07e5ab8226158136762801f.tar.gz
openembedded-core-contrib-dadb84936b3672dcf07e5ab8226158136762801f.tar.bz2
openembedded-core-contrib-dadb84936b3672dcf07e5ab8226158136762801f.zip
oeqa.buildperf: measure apparent size instead of real disk usage
This change aligns disk usage measurements of the eSDK test with the old build-perf-test.sh script. And thus, also makes the results between the old and the new script comparable. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/buildperf/base.py9
-rw-r--r--meta/lib/oeqa/buildperf/test_basic.py6
2 files changed, 11 insertions, 4 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 2c102554b9f..59dd02521c9 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -408,9 +408,14 @@ class BuildPerfTestCase(unittest.TestCase):
int((e_sec % 3600) / 60),
e_sec % 60))
- def measure_disk_usage(self, path, name, legend):
+ def measure_disk_usage(self, path, name, legend, apparent_size=False):
"""Estimate disk usage of a file or directory"""
- ret = runCmd2(['du', '-s', path])
+ cmd = ['du', '-s', '--block-size', '1024']
+ if apparent_size:
+ cmd.append('--apparent-size')
+ cmd.append(path)
+
+ ret = runCmd2(cmd)
size = int(ret.output.split()[0])
log.debug("Size of %s path is %s", path, size)
measurement = {'type': self.DISKUSAGE,
diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py
index e448ed18c90..7a48c1e77fb 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -114,7 +114,8 @@ class Test4(BuildPerfTestCase):
self.bb_vars['SDK_DEPLOY'],
self.bb_vars['TOOLCHAINEXT_OUTPUTNAME'] + '.sh')
# Measure installer size
- self.measure_disk_usage(installer, 'installer_bin', 'eSDK installer')
+ self.measure_disk_usage(installer, 'installer_bin', 'eSDK installer',
+ apparent_size=True)
# Measure deployment time and deployed size
deploy_dir = os.path.join(tmp_dir, 'esdk-deploy')
if os.path.exists(deploy_dir):
@@ -122,4 +123,5 @@ class Test4(BuildPerfTestCase):
self.sync()
self.measure_cmd_resources([installer, '-y', '-d', deploy_dir],
'deploy', 'eSDK deploy')
- self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir')
+ self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir',
+ apparent_size=True)