[binutils-gdb/gdb-8.2-branch] gdb.base/warning.exp tweaks

[Tom Tromey <tromey at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=52ec8c2b0264127d8e7468ab28a0ee079ebc487f

commit 52ec8c2b0264127d8e7468ab28a0ee079ebc487f
Author: Pedro Alves <palves@redhat.com>
Date:   Mon Nov 19 15:08:46 2018 +0000

    gdb.base/warning.exp tweaks
    
    #1- Check that the warning is emitted.
    
    #2- Avoid overriding INTERNAL_GDBFLAGS, as per documentated in
        gdb/testsuite/README:
    
     ~~~
     The testsuite does not override a value provided by the user.
     ~~~
    
    We don't actually need to tweak INTERNAL_GDBFLAGS, we just need to
    append out -data-directory to GDBFLAGS, because each passed
    -data-directory option leads to a call to the warning:
    
     $ ./gdb -data-directory=foo -data-directory=bar
     Warning: foo: No such file or directory.
     Warning: bar: No such file or directory.
     [...]
    
    2018-11-19  Pedro Alves  <palves@redhat.com>
    
    	* gdb.base/warning.exp: Don't override INTERNAL_FLAGS.  Use
    	gdb_spawn_with_cmdline_opts instead of gdb_start.  Check that we
    	see the expected warning.

Diff:
---
 gdb/testsuite/ChangeLog            |  6 ++++++
 gdb/testsuite/gdb.base/warning.exp | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7fadf71..65557f4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-19  Pedro Alves  <palves@redhat.com>
+
+	* gdb.base/warning.exp: Don't override INTERNAL_FLAGS.  Use
+	gdb_spawn_with_cmdline_opts instead of gdb_start.  Check that we
+	see the expected warning.
+
 2018-11-08  Tom Tromey  <tom@tromey.com>
 
 	PR gdb/23555:
diff --git a/gdb/testsuite/gdb.base/warning.exp b/gdb/testsuite/gdb.base/warning.exp
index 53067f4..134218a 100644
--- a/gdb/testsuite/gdb.base/warning.exp
+++ b/gdb/testsuite/gdb.base/warning.exp
@@ -25,12 +25,12 @@ set fd [open $tname w]
 puts $fd "anything"
 close $fd
 
-set save $INTERNAL_GDBFLAGS
-set INTERNAL_GDBFLAGS "-nw -nx -data-directory $tname"
+gdb_spawn_with_cmdline_opts \
+    "-iex \"set pagination off\" -data-directory $tname"
 
-gdb_start
+# Make sure we see the warning.
+gdb_test "" "warning: $tname is not a directory.*" \
+    "got warning"
 
 # Make sure gdb started up.
 gdb_test "echo 23\\n" "23"
-
-set INTERNAL_GDBFLAGS $save