Re: [RFC] Improve testsuite for poor expect behavior

'Daniel Jacobowitz'
2009-06-17T13:36:39Z

On Wed, Jun 17, 2009 at 01:27:23AM +0200, Pierre Muller wrote:
> I will try to resubmit a much shorter patch
> that just handles this without trying to
> modify the executables.

FYI, here's what we do for mingw host in our sources, in main.c:

+#ifdef _WIN32
+ /* A Cygwin ssh session may not look like a terminal to the Windows
+ runtime; ensure unbuffered output. */
+ setvbuf (stdout, NULL, _IONBF, BUFSIZ);
+ setvbuf (stderr, NULL, _IONBF, BUFSIZ);
+#endif
+
+#ifdef __MINGW32__
+ /* In textmode, a '\n' is automatically expanded into "\r\n". When
+ driving the testsuite from a linux host, the '\n' is also
+ expanded into "\r\n". This results in expect seing "\r\r\n".
+ The tests aren't prepared currently for other forms of eol. As a
+ workaround, we force the output to binary mode. Do this only if
+ the files are pipes (cygwin ttys are Windows pipes behind the
+ scenes). */
+ {
+ int in = fileno (stdin);
+ int out = fileno (stdout);
+ int err = fileno (stderr);
+ HANDLE hin = (HANDLE) _get_osfhandle (in);
+ HANDLE hout = (HANDLE) _get_osfhandle (out);
+ HANDLE herr = (HANDLE) _get_osfhandle (err);
+ if (GetFileType (hin) == FILE_TYPE_PIPE)
+ setmode (in, O_BINARY);
+ if (GetFileType (hout) == FILE_TYPE_PIPE)
+ setmode (out, O_BINARY);
+ if (GetFileType (herr) == FILE_TYPE_PIPE)
+ setmode (err, O_BINARY);
+ }
+#endif
+
gdb_stdout = stdio_fileopen (stdout);
gdb_stderr = stdio_fileopen (stderr);
gdb_stdlog = gdb_stderr; /* for moment */

We don't have anything similar in testsuite/lib/set_unbuffered_mode.c
for binmode, but I think that would fix the problem you're seeing in a
minimally intrusive way. I have not tried this on DJGPP at all.

--
Daniel Jacobowitz
CodeSourcery