diff options
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 09ef9fadb2..79db2cc247 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -70,6 +70,8 @@ class QemuRunner: | |||
70 | self.monitorpipe = None | 70 | self.monitorpipe = None |
71 | 71 | ||
72 | self.logger = logger | 72 | self.logger = logger |
73 | # Whether we're expecting an exit and should show related errors | ||
74 | self.canexit = False | ||
73 | 75 | ||
74 | # Enable testing other OS's | 76 | # Enable testing other OS's |
75 | # Set commands for target communication, and default to Linux ALWAYS | 77 | # Set commands for target communication, and default to Linux ALWAYS |
@@ -468,6 +470,7 @@ class QemuRunner: | |||
468 | self.thread.join() | 470 | self.thread.join() |
469 | 471 | ||
470 | def allowexit(self): | 472 | def allowexit(self): |
473 | self.canexit = True | ||
471 | if self.thread: | 474 | if self.thread: |
472 | self.thread.allowexit() | 475 | self.thread.allowexit() |
473 | 476 | ||
@@ -526,7 +529,9 @@ class QemuRunner: | |||
526 | if re.search(self.boot_patterns['search_cmd_finished'], data): | 529 | if re.search(self.boot_patterns['search_cmd_finished'], data): |
527 | break | 530 | break |
528 | else: | 531 | else: |
529 | raise Exception("No data on serial console socket") | 532 | if self.canexit: |
533 | return (1, "") | ||
534 | raise Exception("No data on serial console socket, connection closed?") | ||
530 | 535 | ||
531 | if data: | 536 | if data: |
532 | if raw: | 537 | if raw: |