Re: [PATCH 5/6] testsuite: Introduce $inferior_spawn_id

[Pedro Alves <palves at redhat dot com>]

On 02/27/2015 10:59 AM, Pedro Alves wrote:
> On 02/27/2015 10:42 AM, Pedro Alves wrote:
> 
>> Or we could fix the tests themselves to explicitly call setvbuf
>> if needed and not bother boards at all.  I count only around 20
>> tests that check gdb,noinferiorio, or use gdb_skip_stdio_test, and
>> we could fix them incrementally, as they're converted to
>> use $inferior_spawn_id.  Maybe that's the cleanest.  We can
>> e.g., add:
>>
>>  #include "lib/set_unbuffered_mode.c"
>>
>> at the top of such files, which avoids an explicit call in
>> "main".   That relies on __attribute__ ((constructor)), but
>> we could also call an helper shared function that does the
>> setvbuf from the tests' "main" if we don't want to rely on
>> that attribute.
>>
>> Options, options...
> 
> Something like this.  I think this is the approach I'm liking best.

TBC, I tried both ssh with -t and without -t, and confirmed
the wanted isatty path is take accordingly.  The mingw32 bit
I did not test, but I'm sure we need it.

> 
> ----- 
> From d68fb948b275b85b7f2fa95ac0626c5ba7037114 Mon Sep 17 00:00:00 2001
> From: Pedro Alves <palves@redhat.com>
> Date: Fri, 27 Feb 2015 10:44:15 +0000
> Subject: [PATCH] Add "../lib/unbuffer_output.c" and use it in interrupt.exp
> 
> ---
>  gdb/testsuite/gdb.base/interrupt.c  |  5 +++++
>  gdb/testsuite/lib/unbuffer_output.c | 37 +++++++++++++++++++++++++++++++++++++
>  2 files changed, 42 insertions(+)
>  create mode 100644 gdb/testsuite/lib/unbuffer_output.c
> 
> diff --git a/gdb/testsuite/gdb.base/interrupt.c b/gdb/testsuite/gdb.base/interrupt.c
> index d7bb271..6426015 100644
> --- a/gdb/testsuite/gdb.base/interrupt.c
> +++ b/gdb/testsuite/gdb.base/interrupt.c
> @@ -3,6 +3,8 @@
>  #include <unistd.h>
>  #include <stdlib.h>
>  
> +#include "../lib/unbuffer_output.c"
> +
>  #ifdef SIGNALS
>  #include <signal.h>
>  
> @@ -17,6 +19,9 @@ main ()
>  {
>    char x;
>    int nbytes;
> +
> +  gdb_unbuffer_output ();
> +
>  #ifdef SIGNALS
>    signal (SIGINT, sigint_handler);
>  #endif
> diff --git a/gdb/testsuite/lib/unbuffer_output.c b/gdb/testsuite/lib/unbuffer_output.c
> new file mode 100644
> index 0000000..654d01c
> --- /dev/null
> +++ b/gdb/testsuite/lib/unbuffer_output.c
> @@ -0,0 +1,37 @@
> +/* Copyright (C) 2008-2015 Free Software Foundation, Inc.
> +
> +   This file is part of GDB.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +/* Force outputs to unbuffered mode if not connected to a
> +   terminal.  */
> +
> +#include <stdio.h>
> +
> +static int
> +gdb_unbuffer_output (void)
> +{
> +  /* Always force this for Windows testing.  To a native Windows
> +     program running under under a Cygwin shell/ssh, stdin is really a
> +     Windows pipe, thus not a tty and its outputs ends up fully
> +     buffered.  */
> +#ifndef __MINGW32__
> +  if (!isatty (fileno (stdin)))
> +#endif
> +    {
> +      setvbuf (stdout, NULL, _IONBF, BUFSIZ);
> +      setvbuf (stderr, NULL, _IONBF, BUFSIZ);
> +    }
> +}
> 


Thanks,
Pedro Alves