1693 continue |
1693 continue |
1694 else: |
1694 else: |
1695 continue |
1695 continue |
1696 postout.append(b' ' + el) |
1696 postout.append(b' ' + el) |
1697 |
1697 |
1698 if cmd_line: |
1698 pos, postout = self._process_cmd_line(cmd_line, pos, postout, after) |
1699 # Add on last return code. |
|
1700 ret = int(cmd_line.split()[1]) |
|
1701 if ret != 0: |
|
1702 postout.append(b' [%d]\n' % ret) |
|
1703 if pos in after: |
|
1704 # Merge in non-active test bits. |
|
1705 postout += after.pop(pos) |
|
1706 pos = int(cmd_line.split()[0]) |
|
1707 |
1699 |
1708 if pos in after: |
1700 if pos in after: |
1709 postout += after.pop(pos) |
1701 postout += after.pop(pos) |
1710 |
1702 |
1711 if warnonly == WARN_YES: |
1703 if warnonly == WARN_YES: |
1712 exitcode = False # Set exitcode to warned. |
1704 exitcode = False # Set exitcode to warned. |
1713 |
1705 |
1714 return exitcode, postout |
1706 return exitcode, postout |
|
1707 |
|
1708 def _process_cmd_line(self, cmd_line, pos, postout, after): |
|
1709 """process a "command" part of a line from unified test output""" |
|
1710 if cmd_line: |
|
1711 # Add on last return code. |
|
1712 ret = int(cmd_line.split()[1]) |
|
1713 if ret != 0: |
|
1714 postout.append(b' [%d]\n' % ret) |
|
1715 if pos in after: |
|
1716 # Merge in non-active test bits. |
|
1717 postout += after.pop(pos) |
|
1718 pos = int(cmd_line.split()[0]) |
|
1719 return pos, postout |
1715 |
1720 |
1716 @staticmethod |
1721 @staticmethod |
1717 def rematch(el, l): |
1722 def rematch(el, l): |
1718 try: |
1723 try: |
1719 el = b'(?:' + el + b')' |
1724 el = b'(?:' + el + b')' |