This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4401

run-tests: don't append rtendtracing logs if pipe is /dev/null
ClosedPublic

Authored by pulkit on Aug 27 2018, 1:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa235ee4cfc1c: run-tests: don't append rtendtracing logs if pipe is /dev/null
Summary

If HGCATAPULTSERVERPIPE is not set, we set it to /dev/null, so we need to make
sure the value is not /dev/null before appending logs.

This fixes some of test-run-tests.t failures.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (3 lines)

Diff 10607

tests/run-tests.py

if self._debug: if self._debug:
script.append(b'set -x\n') script.append(b'set -x\n')
if self._hgcommand != b'hg': if self._hgcommand != b'hg':
script.append(b'alias hg="%s"\n' % self._hgcommand) script.append(b'alias hg="%s"\n' % self._hgcommand)
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
script.append(b'alias pwd="pwd -W"\n') script.append(b'alias pwd="pwd -W"\n')
if os.getenv('HGCATAPULTSERVERPIPE'): hgcatapult = os.getenv('HGCATAPULTSERVERPIPE')
if hgcatapult and hgcatapult != '/dev/null':
# Kludge: use a while loop to keep the pipe from getting # Kludge: use a while loop to keep the pipe from getting
# closed by our echo commands. The still-running file gets # closed by our echo commands. The still-running file gets
# reaped at the end of the script, which causes the while # reaped at the end of the script, which causes the while
# loop to exit and closes the pipe. Sigh. # loop to exit and closes the pipe. Sigh.
script.append( script.append(
b'rtendtracing() {\n' b'rtendtracing() {\n'
b' echo END %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n' b' echo END %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n'
b' rm -f "$TESTTMP/.still-running"\n' b' rm -f "$TESTTMP/.still-running"\n'