contrib: make import-checker agree more with run-tests about heredocpy
run-tests.py and import-checker.py take wholly different approaches to
.t-tests, and the result was that they had different notions about
when a Python heredoc had ended, leading to conflicts. This resolves
part of the issue, and the rest I can deal with by tweaking the one
offending test file.
--- a/contrib/import-checker.py Tue Aug 22 15:28:54 2017 -0400
+++ b/contrib/import-checker.py Tue Aug 22 16:37:06 2017 -0400
@@ -693,7 +693,10 @@
else:
script.append(l[4:])
continue
- if inlinepython and l == b' \n':
+ # If we have an empty line or a command for sh, we end the
+ # inline script.
+ if inlinepython and (l == b' \n'
+ or l.startswith(b' $ ')):
yield b''.join(script), (b"%s[%d]" %
(modname, inlinepython)), t, inlinepython
script = []