Skip to content
Snippets Groups Projects
Commit ea7ad8c3988a authored by kiilerix's avatar kiilerix
Browse files

tests: handle .t files without trailing LF

9a2de8dae27b made this simple test-test.t succeed silently:
  $ printf '  $ true' > test-test.t
but did not give a usable .err in this case:
  $ printf '  $ false' > test-test.t

The missing LF will now be fixed in the test output and it will thus give a
test failure and a solution in the .err file.
parent ab93029ab622
No related branches found
No related tags found
No related merge requests found
......@@ -464,6 +464,8 @@
after = {}
expected = {}
for n, l in enumerate(t):
if not l.endswith('\n'):
l += '\n'
if l.startswith(' $ '): # commands
after.setdefault(pos, []).append(l)
prepos = pos
......@@ -480,8 +482,6 @@
# non-command/result - queue up for merged output
after.setdefault(pos, []).append(l)
if script and not script[-1].endswith('\n'):
script[-1] = script[-1] + '\n'
script.append('echo %s %s $?\n' % (salt, n + 1))
fd, name = tempfile.mkstemp(suffix='hg-tst')
......
......@@ -302,5 +302,3 @@
After qrecord b.patch 'diff'
$ hg diff --nodates
End
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment