diff options
author | Corneliu Stoicescu <corneliux.stoicescu@intel.com> | 2014-07-17 19:11:47 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:09:01 +0100 |
commit | dfe4f15d4986acd29fdd5cbc4923795fefb977af (patch) | |
tree | c81367e43a08ed2d482c17c4123266e3ed4fd78a /scripts/test-remote-image | |
parent | 328074d906585f004d4b57ce782e6c2002a27a6a (diff) | |
download | tizen-distro-dfe4f15d4986acd29fdd5cbc4923795fefb977af.tar.gz tizen-distro-dfe4f15d4986acd29fdd5cbc4923795fefb977af.tar.bz2 tizen-distro-dfe4f15d4986acd29fdd5cbc4923795fefb977af.zip |
scripts/test-remote-image: use the scriptpath module
Use the scripts/lib/scriptpath module in order to standardize the adding of bitbake/lib and meta/lib to sys.path.
(From OE-Core rev: 32c5b31d8a22bb8ba49db8a5c797ad0f421e67a3)
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/test-remote-image')
-rwxr-xr-x | scripts/test-remote-image | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/test-remote-image b/scripts/test-remote-image index 8120a6257f..f3a44ebe51 100755 --- a/scripts/test-remote-image +++ b/scripts/test-remote-image @@ -32,8 +32,15 @@ import logging import shutil from abc import ABCMeta, abstractmethod +# Add path to scripts/lib in sys.path; +scripts_path = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0]))) +lib_path = scripts_path + '/lib' +sys.path = sys.path + [lib_path] + +import scriptpath + # Add meta/lib to sys.path -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'meta/lib'))) +scriptpath.add_oe_lib_path() import oeqa.utils.ftools as ftools from oeqa.utils.commands import runCmd, bitbake, get_bb_var @@ -43,7 +50,10 @@ for path in get_bb_var('BBPATH').split(":"): sys.path.insert(0, os.path.abspath(os.path.join(path, 'lib'))) # In order to import modules that contain target controllers, we need the bitbake libraries in sys.path . -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'bitbake/lib'))) +bitbakepath = scriptpath.add_bitbake_lib_path() +if not bitbakepath: + sys.stderr.write("Unable to find bitbake by searching parent directory of this script or PATH\n") + sys.exit(1) # create a logger def logger_create(): |