| hg-reviewers |
(This is an attempt to make it more obvious that the indentation is correct, to
prevent a repeat of 97f52862b1bd)
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/run-tests.py (10 lines) |
| # up script results with our source. These markers include input | # up script results with our source. These markers include input | ||||
| # line number and the last return code. | # line number and the last return code. | ||||
| salt = b"SALT%d" % time.time() | salt = b"SALT%d" % time.time() | ||||
| def addsalt(line, inpython): | def addsalt(line, inpython): | ||||
| if inpython: | if inpython: | ||||
| script.append(b'%s %d 0\n' % (salt, line)) | script.append(b'%s %d 0\n' % (salt, line)) | ||||
| else: | else: | ||||
| script.append(b'echo %s %d $?\n' % (salt, line)) | script.append(b'echo %s %d $?\n' % (salt, line)) | ||||
| active = [] | activetrace = [] | ||||
| session = str(uuid.uuid4()) | session = str(uuid.uuid4()) | ||||
| if PYTHON3: | if PYTHON3: | ||||
| session = session.encode('ascii') | session = session.encode('ascii') | ||||
| hgcatapult = os.getenv('HGCATAPULTSERVERPIPE') | hgcatapult = os.getenv('HGCATAPULTSERVERPIPE') | ||||
| def toggletrace(cmd=None): | def toggletrace(cmd=None): | ||||
| if not hgcatapult or hgcatapult == os.devnull: | if not hgcatapult or hgcatapult == os.devnull: | ||||
| return | return | ||||
| if active: | if activetrace: | ||||
| script.append( | script.append( | ||||
| b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( | b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( | ||||
| session, active[0])) | session, activetrace[0])) | ||||
| if cmd is None: | if cmd is None: | ||||
| return | return | ||||
| if isinstance(cmd, str): | if isinstance(cmd, str): | ||||
| quoted = shellquote(cmd.strip()) | quoted = shellquote(cmd.strip()) | ||||
| else: | else: | ||||
| quoted = shellquote(cmd.strip().decode('utf8')).encode('utf8') | quoted = shellquote(cmd.strip().decode('utf8')).encode('utf8') | ||||
| quoted = quoted.replace(b'\\', b'\\\\') | quoted = quoted.replace(b'\\', b'\\\\') | ||||
| script.append( | script.append( | ||||
| b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( | b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( | ||||
| session, quoted)) | session, quoted)) | ||||
| active[0:] = [quoted] | activetrace[0:] = [quoted] | ||||
| script = [] | script = [] | ||||
| # After we run the shell script, we re-unify the script output | # After we run the shell script, we re-unify the script output | ||||
| # with non-active parts of the source, with synchronization by our | # with non-active parts of the source, with synchronization by our | ||||
| # SALT line number markers. The after table contains the non-active | # SALT line number markers. The after table contains the non-active | ||||
| # components, ordered by line number. | # components, ordered by line number. | ||||
| after = {} | after = {} | ||||
| after.setdefault(pos, []).append(l) | after.setdefault(pos, []).append(l) | ||||
| if inpython: | if inpython: | ||||
| script.append(b'EOF\n') | script.append(b'EOF\n') | ||||
| if skipping is not None: | if skipping is not None: | ||||
| after.setdefault(pos, []).append(' !!! missing #endif\n') | after.setdefault(pos, []).append(' !!! missing #endif\n') | ||||
| addsalt(n + 1, False) | addsalt(n + 1, False) | ||||
| # Need to end any current per-command trace | # Need to end any current per-command trace | ||||
| if active: | if activetrace: | ||||
| toggletrace() | toggletrace() | ||||
| return salt, script, after, expected | return salt, script, after, expected | ||||
| def _processoutput(self, exitcode, output, salt, after, expected): | def _processoutput(self, exitcode, output, salt, after, expected): | ||||
| # Merge the script output back into a unified test. | # Merge the script output back into a unified test. | ||||
| warnonly = 1 # 1: not yet; 2: yes; 3: for sure not | warnonly = 1 # 1: not yet; 2: yes; 3: for sure not | ||||
| if exitcode != 0: | if exitcode != 0: | ||||
| warnonly = 3 | warnonly = 3 | ||||