From d2a03b77450dce58f6b4f9f7fdd3c346a555bcf7 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 18 May 2017 11:47:05 +0100 Subject: [PATCH] gdb.base/fileio.exp: Remove nowarnings ... and quiet -Wnonnull in a different way. gdb/testsuite/ChangeLog: 2017-05-18 Pedro Alves * gdb.base/fileio.c (null_str): New global. (test_stat): Use it. * gdb.base/fileio.exp: Remove nowarnings. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/fileio.c | 6 +++++- gdb/testsuite/gdb.base/fileio.exp | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6f877daeae1..2ebddca95c3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-05-18 Pedro Alves + + * gdb.base/fileio.c (null_str): New global. + (test_stat): Use it. + * gdb.base/fileio.exp: Remove nowarnings. + 2017-05-17 Yao Qi * gdb.base/fileio.exp: Pass nowarnings to gdb_compile. diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c index e44317344a2..38537db69ba 100644 --- a/gdb/testsuite/gdb.base/fileio.c +++ b/gdb/testsuite/gdb.base/fileio.c @@ -76,6 +76,10 @@ static const char *strerrno (int err); static void stop () {} +/* A NULL string. We pass this to stat below instead of a NULL + literal to avoid -Wnonnull warnings. */ +const char *null_str; + int test_open () { @@ -294,7 +298,7 @@ test_stat () stop (); /* NULL pathname */ errno = 0; - ret = stat (NULL, &st); + ret = stat (null_str, &st); printf ("stat 2: ret = %d, errno = %d %s\n", ret, errno, strerrno (errno)); stop (); diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp index 14aaa0d36ab..6bb71415d17 100644 --- a/gdb/testsuite/gdb.base/fileio.exp +++ b/gdb/testsuite/gdb.base/fileio.exp @@ -31,7 +31,7 @@ if {[is_remote host]} { if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable \ - [list debug nowarnings "additional_flags=-DOUTDIR=\"$outdir/\""]] != "" } { + [list debug "additional_flags=-DOUTDIR=\"$outdir/\""]] != "" } { untested "failed to compile" return -1 } -- 2.30.2