aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-08-26 10:33:09 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:29 +0100
commit69b3c63e32d09ea4a41b21daacdff6bf1fc447c1 (patch)
treea744b1d9cfd216fcc4eee561b89e795da16b2f78
parent3efbd49fd80d2b349a8fd44dbcd509168dbc1061 (diff)
downloadopenembedded-core-contrib-69b3c63e32d09ea4a41b21daacdff6bf1fc447c1.tar.gz
oeqa.buildperf: make tests independent
Add test set-up functionality so that the individual tests do not depend on each other. This should make sure that a failure in one test does not affect the results of another test. The patch also makes it reasonable to run only a subset of the tests by using the --run-tests option. The increase in total execution time of the full suite - caused by the additional set-up steps - is insignificant because normally no additional tasks need to be run. The previous test has already done all set-up work. 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.py7
-rw-r--r--meta/lib/oeqa/buildperf/test_basic.py10
2 files changed, 14 insertions, 3 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index e4a79486f2..83439f1bdb 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -257,6 +257,7 @@ class BuildPerfTestCase(unittest.TestCase):
"""Base class for build performance tests"""
SYSRES = 'sysres'
DISKUSAGE = 'diskusage'
+ build_target = None
def __init__(self, *args, **kwargs):
super(BuildPerfTestCase, self).__init__(*args, **kwargs)
@@ -271,6 +272,12 @@ class BuildPerfTestCase(unittest.TestCase):
self.times = []
self.sizes = []
+ def setUp(self):
+ """Set-up fixture for each test"""
+ if self.build_target:
+ self.log_cmd_output(['bitbake', self.build_target,
+ '-c', 'fetchall'])
+
def run(self, *args, **kwargs):
"""Run test"""
self.start_time = datetime.now()
diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py
index 9310f3d86a..25dbfb0bf7 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -23,7 +23,6 @@ class Test1P1(BuildPerfTestCase):
def test1(self):
"""Measure wall clock of bitbake core-image-sato and size of tmp dir"""
- self.log_cmd_output("bitbake {} -c fetchall".format(self.build_target))
self.rm_tmp()
self.rm_sstate()
self.rm_cache()
@@ -39,8 +38,10 @@ class Test1P2(BuildPerfTestCase):
def test12(self):
"""Measure bitbake virtual/kernel"""
- self.log_cmd_output("bitbake {} -c cleansstate".format(
- self.build_target))
+ # Build and cleans state in order to get all dependencies pre-built
+ self.log_cmd_output(['bitbake', self.build_target])
+ self.log_cmd_output(['bitbake', self.build_target, '-c', 'cleansstate'])
+
self.sync()
self.measure_cmd_resources(['bitbake', self.build_target], 'build',
'bitbake ' + self.build_target)
@@ -73,6 +74,9 @@ class Test2(BuildPerfTestCase):
def test2(self):
"""Measure bitbake core-image-sato -c rootfs with sstate"""
+ # Build once in order to populate sstate cache
+ self.log_cmd_output(['bitbake', self.build_target])
+
self.rm_tmp()
self.rm_cache()
self.sync()