# HG changeset patch
# User jld
# Date 1048587307 0
# Node ID 14cc4c926c7e737be5acf37a3b9073fdc5a0616c
# Parent  6001f11af5db288d1087777efcce17b214e1693c
* standalone/wxwin/runtestsdlg.cpp: Strip CRs from test output.

diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-25  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/runtestsdlg.cpp: Remove CR characters in test
+	output. [ Bugzilla 85163 ]
+
 2003-03-19  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/appsettings.cpp,
diff --git a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
--- a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
@@ -525,7 +525,16 @@ void CALLBACK ecRunTestsDialog::TestOutp
     ecRunTestsDialog* pWnd = (ecRunTestsDialog*)pParam;
     if (ecRunTestsDialog::m_runTestsDialog)
     {
+        // FIXME: test output should not contain CR characters on non-Windows
+        // platforms so need to find the root of this problem
+#ifndef __WXMSW__
+        wxString output(psz);
+        output.Replace(wxT("\r"), wxEmptyString); // remove CR characters
+        pWnd->OutputToBuffer(output);
+#else
+        // FIXME ends
         pWnd->OutputToBuffer(psz);
+#endif
     }
 }