diff options
Diffstat (limited to 'meta/lib/oeqa/sdk/testsdk.py')
-rw-r--r-- | meta/lib/oeqa/sdk/testsdk.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/lib/oeqa/sdk/testsdk.py b/meta/lib/oeqa/sdk/testsdk.py index 35e40187bc..518b09febb 100644 --- a/meta/lib/oeqa/sdk/testsdk.py +++ b/meta/lib/oeqa/sdk/testsdk.py | |||
@@ -23,14 +23,6 @@ class TestSDKBase(object): | |||
23 | return configuration | 23 | return configuration |
24 | 24 | ||
25 | @staticmethod | 25 | @staticmethod |
26 | def get_sdk_json_result_dir(d): | ||
27 | json_result_dir = os.path.join(d.getVar("LOG_DIR"), 'oeqa') | ||
28 | custom_json_result_dir = d.getVar("OEQA_JSON_RESULT_DIR") | ||
29 | if custom_json_result_dir: | ||
30 | json_result_dir = custom_json_result_dir | ||
31 | return json_result_dir | ||
32 | |||
33 | @staticmethod | ||
34 | def get_sdk_result_id(configuration): | 26 | def get_sdk_result_id(configuration): |
35 | return '%s_%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDKMACHINE'], configuration['MACHINE'], configuration['STARTTIME']) | 27 | return '%s_%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDKMACHINE'], configuration['MACHINE'], configuration['STARTTIME']) |
36 | 28 | ||
@@ -72,6 +64,7 @@ class TestSDK(TestSDKBase): | |||
72 | 64 | ||
73 | from bb.utils import export_proxies | 65 | from bb.utils import export_proxies |
74 | from oeqa.utils import make_logger_bitbake_compatible | 66 | from oeqa.utils import make_logger_bitbake_compatible |
67 | from oeqa.utils import get_json_result_dir | ||
75 | 68 | ||
76 | pn = d.getVar("PN") | 69 | pn = d.getVar("PN") |
77 | logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) | 70 | logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) |
@@ -79,6 +72,9 @@ class TestSDK(TestSDKBase): | |||
79 | # sdk use network for download projects for build | 72 | # sdk use network for download projects for build |
80 | export_proxies(d) | 73 | export_proxies(d) |
81 | 74 | ||
75 | # We need the original PATH for testing the eSDK, not with our manipulations | ||
76 | os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") | ||
77 | |||
82 | tcname = self.get_tcname(d) | 78 | tcname = self.get_tcname(d) |
83 | 79 | ||
84 | if not os.path.exists(tcname): | 80 | if not os.path.exists(tcname): |
@@ -131,7 +127,7 @@ class TestSDK(TestSDKBase): | |||
131 | component = "%s %s" % (pn, self.context_executor_class.name) | 127 | component = "%s %s" % (pn, self.context_executor_class.name) |
132 | context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) | 128 | context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) |
133 | configuration = self.get_sdk_configuration(d, self.test_type) | 129 | configuration = self.get_sdk_configuration(d, self.test_type) |
134 | result.logDetails(self.get_sdk_json_result_dir(d), | 130 | result.logDetails(get_json_result_dir(d), |
135 | configuration, | 131 | configuration, |
136 | self.get_sdk_result_id(configuration)) | 132 | self.get_sdk_result_id(configuration)) |
137 | result.logSummary(component, context_msg) | 133 | result.logSummary(component, context_msg) |