From 2d35e871274a48331c4d6c7b3e4fbee42b901f33 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 7 Apr 2016 22:18:49 +0200 Subject: [PATCH] testsuite: Fix false FAILs with .bashrc GDBHISTFILE=... $ GDBHISTFILE=/tmp/gdbhistfile runtest gdb.base/gdbhistsize-history.exp gdb.base/gdbinit-history.exp Running ./gdb.base/gdbinit-history.exp ... FAIL: gdb.base/gdbinit-history.exp: home=gdbinit-history/unlimited gdbhistsize=1000: show commands FAIL: gdb.base/gdbinit-history.exp: home=gdbinit-history/unlimited gdbhistsize=foo: show commands Running ./gdb.base/gdbhistsize-history.exp ... FAIL: gdb.base/gdbhistsize-history.exp: histsize=: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=20: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize= 20 : show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=-5: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=not_an_integer: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=10zab: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=-5ab: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=99999999999999999999999999999999999: show commands FAIL: gdb.base/gdbhistsize-history.exp: histsize=50: show commands This happens for my setup due to my: $ grep GDB ~/.bashrc export GDBHISTFILE="$HOME/.gdb_history" gdb/testsuite/ChangeLog 2016-04-07 Jan Kratochvil * gdb.base/gdbhistsize-history.exp: Save and unset GDBHISTFILE and GDBHISTSIZE prior to the tests. * gdb.base/gdbinit-history.exp: Likewise. --- gdb/testsuite/ChangeLog | 8 +++++++- gdb/testsuite/gdb.base/gdbhistsize-history.exp | 8 +++++++- gdb/testsuite/gdb.base/gdbinit-history.exp | 10 ++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 53755fe4d9f..73663c2a050 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,10 @@ -2015-04-07 Pedro Alves +2016-04-07 Jan Kratochvil + + * gdb.base/gdbhistsize-history.exp: Save and unset GDBHISTFILE and + GDBHISTSIZE prior to the tests. + * gdb.base/gdbinit-history.exp: Likewise. + +2016-04-07 Pedro Alves * gdb.compile/compile.exp: Use gdb_compile with "shlib=" option instead of build_executable. Use gdb_load_shlibs. diff --git a/gdb/testsuite/gdb.base/gdbhistsize-history.exp b/gdb/testsuite/gdb.base/gdbhistsize-history.exp index 98d3bf3ad7f..16d1068d970 100644 --- a/gdb/testsuite/gdb.base/gdbhistsize-history.exp +++ b/gdb/testsuite/gdb.base/gdbhistsize-history.exp @@ -32,7 +32,13 @@ if { [is_remote host] } { proc test_histsize_history_setting { histsize size { env_var "GDBHISTSIZE" } } { global env - save_vars { env($env_var) } { + save_vars { env(GDBHISTFILE) env(GDBHISTSIZE) env($env_var) } { + # These environment variables take precedence over whatever + # history size is set in .gdbinit. Make sure the former is not + # set. + unset -nocomplain env(GDBHISTFILE) + unset -nocomplain env(GDBHISTSIZE) + set env($env_var) $histsize with_test_prefix "histsize=$histsize" { diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp index 1e0a5889dce..807f31ca00d 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -36,12 +36,13 @@ proc test_gdbinit_history_setting { home size { gdbhistsize_val "-" } } { global srcdir global subdir - save_vars { INTERNAL_GDBFLAGS env(GDBHISTSIZE) env(HOME) } { + save_vars { INTERNAL_GDBFLAGS env(GDBHISTFILE) env(GDBHISTSIZE) env(HOME) } { set env(HOME) "$srcdir/$subdir/$home" - # The GDBHISTSIZE environment variable takes precedence over whatever + # These environment variables take precedence over whatever # history size is set in .gdbinit. Make sure the former is not # set. + unset -nocomplain env(GDBHISTFILE) unset -nocomplain env(GDBHISTSIZE) if { $gdbhistsize_val != "-" } { @@ -77,10 +78,11 @@ proc test_no_truncation_of_unlimited_history_file { } { global env global INTERNAL_GDBFLAGS - save_vars { INTERNAL_GDBFLAGS env(GDBHISTSIZE) } { - # The GDBHISTSIZE environment variable takes precedence over whatever + save_vars { INTERNAL_GDBFLAGS env(GDBHISTFILE) env(GDBHISTSIZE) } { + # These environment variables take precedence over whatever # history size is set in .gdbinit. Make sure the former is not # set. + unset -nocomplain env(GDBHISTFILE) unset -nocomplain env(GDBHISTSIZE) set temp_gdbinit [standard_output_file "gdbinit-history.gdbinit"] -- 2.30.2