summaryrefslogtreecommitdiffstats
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-06 07:51:00 +0100
commitb16001f3e2d54a6b35f185b5ff71bcb797fa7e0d (patch)
tree10d5c29fcf7e03cb61cd8b8daacd208a9b44f0e0
parent4189a1977e65f71ddb8fc0498bcef91754c673d8 (diff)
downloadpoky-b16001f3e2d54a6b35f185b5ff71bcb797fa7e0d.tar.gz
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. (From OE-Core rev: dadb84936b3672dcf07e5ab8226158136762801f) 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 2c102554b9..59dd02521c 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -408,9 +408,14 @@ class BuildPerfTestCase(unittest.TestCase):
408 int((e_sec % 3600) / 60), 408 int((e_sec % 3600) / 60),
409 e_sec % 60)) 409 e_sec % 60))
410 410
411 def measure_disk_usage(self, path, name, legend): 411 def measure_disk_usage(self, path, name, legend, apparent_size=False):
412 """Estimate disk usage of a file or directory""" 412 """Estimate disk usage of a file or directory"""
413 ret = runCmd2(['du', '-s', path]) 413 cmd = ['du', '-s', '--block-size', '1024']
414 if apparent_size:
415 cmd.append('--apparent-size')
416 cmd.append(path)
417
418 ret = runCmd2(cmd)
414 size = int(ret.output.split()[0]) 419 size = int(ret.output.split()[0])
415 log.debug("Size of %s path is %s", path, size) 420 log.debug("Size of %s path is %s", path, size)
416 measurement = {'type': self.DISKUSAGE, 421 measurement = {'type': self.DISKUSAGE,
diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py
index e448ed18c9..7a48c1e77f 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -114,7 +114,8 @@ class Test4(BuildPerfTestCase):
114 self.bb_vars['SDK_DEPLOY'], 114 self.bb_vars['SDK_DEPLOY'],
115 self.bb_vars['TOOLCHAINEXT_OUTPUTNAME'] + '.sh') 115 self.bb_vars['TOOLCHAINEXT_OUTPUTNAME'] + '.sh')
116 # Measure installer size 116 # Measure installer size
117 self.measure_disk_usage(installer, 'installer_bin', 'eSDK installer') 117 self.measure_disk_usage(installer, 'installer_bin', 'eSDK installer',
118 apparent_size=True)
118 # Measure deployment time and deployed size 119 # Measure deployment time and deployed size
119 deploy_dir = os.path.join(tmp_dir, 'esdk-deploy') 120 deploy_dir = os.path.join(tmp_dir, 'esdk-deploy')
120 if os.path.exists(deploy_dir): 121 if os.path.exists(deploy_dir):
@@ -122,4 +123,5 @@ class Test4(BuildPerfTestCase):
122 self.sync() 123 self.sync()
123 self.measure_cmd_resources([installer, '-y', '-d', deploy_dir], 124 self.measure_cmd_resources([installer, '-y', '-d', deploy_dir],
124 'deploy', 'eSDK deploy') 125 'deploy', 'eSDK deploy')
125 self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir') 126 self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir',
127 apparent_size=True)