You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/05/06 21:12:28 UTC
svn commit: r941866 -
/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Author: pburba
Date: Thu May 6 19:12:28 2010
New Revision: 941866
URL: http://svn.apache.org/viewvc?rev=941866&view=rev
Log:
* subversion/tests/cmdline/svndumpfilter_tests.py
(filter_and_return_output): Normalize the stderr line endings on Windows.
Modified:
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=941866&r1=941865&r2=941866&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Thu May 6 19:12:28 2010
@@ -68,7 +68,12 @@ def filter_and_return_output(dump, bufsi
exit_code, output, errput = svntest.main.run_command_stdin(
svntest.main.svndumpfilter_binary, expected_errput, bufsize, 1,
dump, *varargs)
-
+
+ # Since we call svntest.main.run_command_stdin() in binary mode,
+ # normalize the stderr line endings on Windows ourselves.
+ if sys.platform == 'win32':
+ errput = map(lambda x : x.replace('\r\n', '\n'), errput)
+
return output, errput