83 |
83 |
84 for tsrc in tsrc_paths: |
84 for tsrc in tsrc_paths: |
85 hrh = os.path.join(self.build_drive + os.sep, 'epoc32', 'include', 'feature_settings.hrh') |
85 hrh = os.path.join(self.build_drive + os.sep, 'epoc32', 'include', 'feature_settings.hrh') |
86 if os.path.exists(tsrc): |
86 if os.path.exists(tsrc): |
87 if os.path.exists(hrh): |
87 if os.path.exists(hrh): |
88 temp_dict = c_parser.get_cpp_output(path(tsrc), "d", hrh) |
88 temp_dict = c_parser.get_cpp_output(path(tsrc), "d", hrh, self.build_drive) |
89 else: |
89 else: |
90 temp_dict = c_parser.get_cpp_output(path(tsrc), "d") |
90 temp_dict = c_parser.get_cpp_output(path(tsrc), "d") |
91 for t_key, t_value in temp_dict.items(): |
91 for t_key, t_value in temp_dict.items(): |
92 self.tsrc_paths_dict[t_key] = t_value |
92 self.tsrc_paths_dict[t_key] = t_value |
93 else: |
93 else: |
155 self.test_timeout = config.test_timeout |
155 self.test_timeout = config.test_timeout |
156 if hasattr(config, 'eunitexerunner_flags'): |
156 if hasattr(config, 'eunitexerunner_flags'): |
157 self.eunitexerunner_flags = config.eunitexerunner_flags |
157 self.eunitexerunner_flags = config.eunitexerunner_flags |
158 self.sets = [] |
158 self.sets = [] |
159 self.src_dst = [] |
159 self.src_dst = [] |
|
160 self.dll_files = {} |
160 self.pmd_files = [] |
161 self.pmd_files = [] |
161 self.trace_activation_files = [] |
162 self.trace_activation_files = [] |
162 self.trace_enabled = 'False' |
163 self.trace_enabled = 'False' |
163 if hasattr(config, 'trace_enabled'): |
164 if hasattr(config, 'trace_enabled'): |
164 self.trace_enabled = to_bool(config.trace_enabled) |
165 self.trace_enabled = to_bool(config.trace_enabled) |
181 self.test_type = config.test_type |
182 self.test_type = config.test_type |
182 |
183 |
183 def insert_set(self, data_files=None, config_files=None, |
184 def insert_set(self, data_files=None, config_files=None, |
184 engine_ini_file=None, image_files=None, sis_files=None, |
185 engine_ini_file=None, image_files=None, sis_files=None, |
185 testmodule_files=None, test_timeout=None,eunitexerunner_flags=None , test_harness=None, |
186 testmodule_files=None, test_timeout=None,eunitexerunner_flags=None , test_harness=None, |
186 src_dst=None, pmd_files=None, trace_activation_files=None, custom_dir=None, component_path=None): |
187 src_dst=None, pmd_files=None, trace_activation_files=None, custom_dir=None, |
|
188 dll_files=None, component_path=None): |
187 """ |
189 """ |
188 Insert a test set into the test plan. |
190 Insert a test set into the test plan. |
189 """ |
191 """ |
190 |
192 |
191 if not custom_dir is None: |
193 if not custom_dir is None: |
210 pmd_files = [] |
212 pmd_files = [] |
211 if trace_activation_files is None: |
213 if trace_activation_files is None: |
212 trace_activation_files = [] |
214 trace_activation_files = [] |
213 if component_path is None: |
215 if component_path is None: |
214 component_path = self.component_path |
216 component_path = self.component_path |
|
217 if dll_files is None: |
|
218 dll_files = self.dll_files |
215 |
219 |
216 setd = dict(name="set%d" % len(self.sets), |
220 setd = dict(name="set%d" % len(self.sets), |
217 image_files=image_files, engine_ini_file=engine_ini_file, ctc_enabled=self.ctc_enabled, component_path=component_path) |
221 image_files=image_files, engine_ini_file=engine_ini_file, ctc_enabled=self.ctc_enabled, dll_files=dll_files, component_path=component_path) |
218 |
222 |
219 setd = dict(setd, custom_dir=custom_dir) |
223 setd = dict(setd, custom_dir=custom_dir) |
220 if sis_files: |
224 if sis_files: |
221 setd = dict(setd, sis_files=sis_files, test_timeout=test_timeout, eunitexerunner_flags=eunitexerunner_flags, test_harness=test_harness, ) |
225 setd = dict(setd, sis_files=sis_files, test_timeout=test_timeout, eunitexerunner_flags=eunitexerunner_flags, test_harness=test_harness, ) |
222 else: |
226 else: |
418 if config.ats4_enabled.lower() == 'true': |
422 if config.ats4_enabled.lower() == 'true': |
419 generator = adg.Ats3TemplateTestDropGenerator() |
423 generator = adg.Ats3TemplateTestDropGenerator() |
420 else: |
424 else: |
421 generator = adg.Ats3TestDropGenerator() |
425 generator = adg.Ats3TestDropGenerator() |
422 _logger.info("generating drop file: %s" % config.drop_file) |
426 _logger.info("generating drop file: %s" % config.drop_file) |
423 generator.generate(test_plan, output_file=config.drop_file, config_file=config.config_file) |
427 generator.generate(test_plan, output_file=config.drop_file, config_file=config.config_file ) |
424 |
428 |
425 def split_paths(arg, delim=","): |
429 def split_paths(arg, delim=","): |
426 """ |
430 """ |
427 Split the string by delim, removing extra whitespace. |
431 Split the string by delim, removing extra whitespace. |
428 """ |
432 """ |