From f4128f0e462e8c0ca2d3aabb99abd15e44e85c5b Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 27 Jun 2016 15:16:34 +0300 Subject: oe-build-perf-test: use new unittest based framework Convert scripts/oe-build-perf-test to be compatible with the new Python unittest based buildperf test framework. (From OE-Core rev: 249d99cd7ec00b3227c194eb4b9b21ea4dcb7315) Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/oe-build-perf-test | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'scripts/oe-build-perf-test') diff --git a/scripts/oe-build-perf-test b/scripts/oe-build-perf-test index 8142b0332b..786c715dfc 100755 --- a/scripts/oe-build-perf-test +++ b/scripts/oe-build-perf-test @@ -21,12 +21,15 @@ import logging import os import shutil import sys +import unittest from datetime import datetime sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) + '/lib') import scriptpath scriptpath.add_oe_lib_path() -from oeqa.buildperf import BuildPerfTestRunner, KernelDropCaches +import oeqa.buildperf +from oeqa.buildperf import (BuildPerfTestLoader, BuildPerfTestResult, + BuildPerfTestRunner, KernelDropCaches) from oeqa.utils.commands import runCmd @@ -123,19 +126,23 @@ def main(argv=None): # Check our capability to drop caches and ask pass if needed KernelDropCaches.check() + # Load build perf tests + loader = BuildPerfTestLoader() + suite = loader.discover(start_dir=os.path.dirname(oeqa.buildperf.__file__)) # Set-up log file out_dir = args.out_dir.format(date=datetime.now().strftime('%Y%m%d%H%M%S')) setup_file_logging(os.path.join(out_dir, 'output.log')) # Run actual tests - runner = BuildPerfTestRunner(out_dir) archive_build_conf(out_dir) - ret = runner.run_tests() - if not ret: + runner = BuildPerfTestRunner(out_dir, verbosity=2) + result = runner.run(suite) + if result.wasSuccessful(): if args.globalres_file: - runner.update_globalres_file(args.globalres_file) + result.update_globalres_file(args.globalres_file) + return 0 - return ret + return 1 if __name__ == '__main__': -- cgit v1.2.3-54-g00ecf