Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions python/qemu/ot/pyot/executer.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ def run(self, debug: bool, allow_no_test: bool) -> int:
'UTFILE': basename(test),
})
self._log.info('[TEST %s] (%d/%d)', test_name, tpos, tcount)
context = 'pre'
exec_info = self._build_test_command(test)
exec_info.test_name = test_name
vcplogfile = self._log_vcp_streams(exec_info)
context = 'pre'
exec_info.context.execute(context)
context = 'with'
tret, xtime, err = qot.run(exec_info)
Expand Down Expand Up @@ -257,7 +257,7 @@ def run(self, debug: bool, allow_no_test: bool) -> int:
self._log.info('%s count: %d',
self.RESULT_MAP.get(kind, kind),
results[kind])
# sort by the largest occurence, discarding success
# sort by the largest occurrence, discarding success
errors = sorted((x for x in results.items() if x[0] > 0),
key=lambda x: -x[1])
# overall return code is the most common error, or success otherwise
Expand Down Expand Up @@ -307,7 +307,7 @@ def _cleanup_temp_files(self, storage: dict[str, set[str]]) -> None:

def _build_command(self, args: Namespace,
opts: Optional[list[str]] = None) -> EasyDict[str, Any]:
raise NotImplementedError('Abstact command')
raise NotImplementedError('Abstract command')

def _build_test_command(self, filename: str) -> EasyDict[str, Any]:
test_name = self.get_test_radix(filename)
Expand Down
2 changes: 1 addition & 1 deletion python/qemu/ot/pyot/qemu/executer.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _build_fw_args(self, args: Namespace) \
else:
if xtype != 'elf':
raise ValueError(f'No support for test type: '
f'{xtype.upper()}')
f'{xtype.upper()} for {exec_path}')
if rom_exec:
# generate ROM option(s) for the application itself
for chip in range(chiplet_count):
Expand Down
4 changes: 2 additions & 2 deletions python/qemu/ot/pyot/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ def command(self) -> str:
return normpath(self._cmd.split(' ', 1)[0])

@property
def first_error(self):
def first_error(self) -> str:
"""Return the message of the first error, if any."""
return self._first_error

def _run(self):
def _run(self) -> None:
self._resume = True
if self._sync and not self._sync.is_set():
self._log.info('Waiting for sync')
Expand Down
Loading