Fix this test on Solaris.  There can be embedded \r, so don't just replace the one at the end.
Fix this test on Solaris.  There can be embedded \r, so don't just replace
the one at the end.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator