# HG changeset patch # User Mads Kiilerich # Date 2010-11-05 23:31:44 # Node ID ea7ad8c3988aa27266b24b3cc1a52bcdcb91b0e0 # Parent ab93029ab622d4c6167fe792fc53dcd73fc86545 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. diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -464,6 +464,8 @@ def tsttest(test, options, replacements) 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 @@ def tsttest(test, options, replacements) # 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') diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -302,5 +302,3 @@ After qrecord b.patch 'tip' After qrecord b.patch 'diff' $ hg diff --nodates - -End \ No newline at end of file