Mercurial > hg > mercurial-crew
comparison tests/run-tests.py @ 17741:a51304b851c6
run-tests: use more explicit criteria for detecting no-eol
Preparing for the situation where there could be unsalted lines not terminated
with \n.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 10 Oct 2012 01:37:53 +0200 |
| parents | 5b08e8b7ab00 |
| children | 405b6bd015df |
comparison
equal
deleted
inserted
replaced
| 17740:e6067bec18da | 17741:a51304b851c6 |
|---|---|
| 688 lout, lcmd = l, None | 688 lout, lcmd = l, None |
| 689 if salt in l: | 689 if salt in l: |
| 690 lout, lcmd = l.split(salt, 1) | 690 lout, lcmd = l.split(salt, 1) |
| 691 | 691 |
| 692 if lout: | 692 if lout: |
| 693 if lcmd: | 693 if not lout.endswith('\n'): |
| 694 # output block had no trailing newline, clean up | |
| 695 lout += ' (no-eol)\n' | 694 lout += ' (no-eol)\n' |
| 696 | 695 |
| 697 # find the expected output at the current position | 696 # find the expected output at the current position |
| 698 el = None | 697 el = None |
| 699 if pos in expected and expected[pos]: | 698 if pos in expected and expected[pos]: |