diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2017-02-21 14:33:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:10 +0000 |
commit | 19d23814e449101f57c8f149c77ee8697c636f43 (patch) | |
tree | d6e79252c334f3f71caff686423cfa52ff2327a5 /meta/lib/oeqa/selftest/runtime-test.py | |
parent | ef010c1a1d823870aba80152fc13c32c62e95146 (diff) | |
download | poky-19d23814e449101f57c8f149c77ee8697c636f43.tar.gz |
selftest: Optimize get_bb_var use
get_bb_var calls bitbake every time it is used and every call
would take about 7 seconds. There are tests that calls get_bb_var
several times when they can use get_bb_vars. Also there are tests
that calls it to fetch the same variable over and over again.
This will optimize the use of get_bb_var and get_bb_vars for a
little speed up in the tests.
[YOCTO #11037]
(From OE-Core rev: e53f86ba8aeb6d2e9eb259329001d27d62401072)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/runtime-test.py')
-rw-r--r-- | meta/lib/oeqa/selftest/runtime-test.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py index a673f36d39..e8b483d7f8 100644 --- a/meta/lib/oeqa/selftest/runtime-test.py +++ b/meta/lib/oeqa/selftest/runtime-test.py | |||
@@ -1,5 +1,5 @@ | |||
1 | from oeqa.selftest.base import oeSelfTest | 1 | from oeqa.selftest.base import oeSelfTest |
2 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu | 2 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu |
3 | from oeqa.utils.decorators import testcase | 3 | from oeqa.utils.decorators import testcase |
4 | import os | 4 | import os |
5 | import re | 5 | import re |
@@ -31,8 +31,9 @@ class TestExport(oeSelfTest): | |||
31 | bitbake('core-image-minimal') | 31 | bitbake('core-image-minimal') |
32 | bitbake('-c testexport core-image-minimal') | 32 | bitbake('-c testexport core-image-minimal') |
33 | 33 | ||
34 | # Verify if TEST_EXPORT_DIR was created | ||
35 | testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') | 34 | testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') |
35 | |||
36 | # Verify if TEST_EXPORT_DIR was created | ||
36 | isdir = os.path.isdir(testexport_dir) | 37 | isdir = os.path.isdir(testexport_dir) |
37 | self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' % testexport_dir) | 38 | self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' % testexport_dir) |
38 | 39 | ||
@@ -73,10 +74,14 @@ class TestExport(oeSelfTest): | |||
73 | bitbake('core-image-minimal') | 74 | bitbake('core-image-minimal') |
74 | bitbake('-c testexport core-image-minimal') | 75 | bitbake('-c testexport core-image-minimal') |
75 | 76 | ||
77 | needed_vars = ['TEST_EXPORT_DIR', 'TEST_EXPORT_SDK_DIR', 'TEST_EXPORT_SDK_NAME'] | ||
78 | bb_vars = get_bb_vars(needed_vars, 'core-image-minimal') | ||
79 | testexport_dir = bb_vars['TEST_EXPORT_DIR'] | ||
80 | sdk_dir = bb_vars['TEST_EXPORT_SDK_DIR'] | ||
81 | sdk_name = bb_vars['TEST_EXPORT_SDK_NAME'] | ||
82 | |||
76 | # Check for SDK | 83 | # Check for SDK |
77 | testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') | 84 | tarball_name = "%s.sh" % sdk_name |
78 | sdk_dir = get_bb_var('TEST_EXPORT_SDK_DIR', 'core-image-minimal') | ||
79 | tarball_name = "%s.sh" % get_bb_var('TEST_EXPORT_SDK_NAME', 'core-image-minimal') | ||
80 | tarball_path = os.path.join(testexport_dir, sdk_dir, tarball_name) | 85 | tarball_path = os.path.join(testexport_dir, sdk_dir, tarball_name) |
81 | msg = "Couldn't find SDK tarball: %s" % tarball_path | 86 | msg = "Couldn't find SDK tarball: %s" % tarball_path |
82 | self.assertEqual(os.path.isfile(tarball_path), True, msg) | 87 | self.assertEqual(os.path.isfile(tarball_path), True, msg) |