From 64ea88dcd7fe63b28761aed765bce1cf0cd5f709 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 10 May 2012 16:25:19 +0000 Subject: [PATCH] Add print 'file'::var testcase with two libs defining the same global variable gdb/testsuite/ChangeLog: * gdb.base/print-file-var-lib1.c, gdb.base/print-file-var-lib2.c, gdb.base/print-file-var-main.c, gdb.base/print-file-var.exp: New files. gdb/ChangeLog: * config/djgpp/fnchange.lst: Add entries for print-file-var-lib1.c, print-file-var-lib2.c, print-file-var-main.c and print-file-var.exp (located in gdb/testsuite/gdb.base). --- gdb/ChangeLog | 6 +++ gdb/config/djgpp/fnchange.lst | 4 ++ gdb/testsuite/ChangeLog | 6 +++ gdb/testsuite/gdb.base/print-file-var-lib1.c | 23 ++++++++ gdb/testsuite/gdb.base/print-file-var-lib2.c | 23 ++++++++ gdb/testsuite/gdb.base/print-file-var-main.c | 29 +++++++++++ gdb/testsuite/gdb.base/print-file-var.exp | 55 ++++++++++++++++++++ 7 files changed, 146 insertions(+) create mode 100644 gdb/testsuite/gdb.base/print-file-var-lib1.c create mode 100644 gdb/testsuite/gdb.base/print-file-var-lib2.c create mode 100644 gdb/testsuite/gdb.base/print-file-var-main.c create mode 100644 gdb/testsuite/gdb.base/print-file-var.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01f4be986bf..31a37945e89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-05-10 Joel Brobecker + + * config/djgpp/fnchange.lst: Add entries for print-file-var-lib1.c, + print-file-var-lib2.c, print-file-var-main.c and + print-file-var.exp (located in gdb/testsuite/gdb.base). + 2012-05-10 Joel Brobecker * findvar.c (default_read_var_value): For LOC_UNRESOLVED symbols, diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst index 59e456e92f2..7d5ea82dc9a 100644 --- a/gdb/config/djgpp/fnchange.lst +++ b/gdb/config/djgpp/fnchange.lst @@ -417,6 +417,10 @@ @V@/gdb/testsuite/gdb.base/hook-stop-frame.c @V@/gdb/testsuite/gdb.base/hstop-frame.c @V@/gdb/testsuite/gdb.base/hook-stop-continue.exp @V@/gdb/testsuite/gdb.base/hstop-continue.exp @V@/gdb/testsuite/gdb.base/hook-stop-frame.exp @V@/gdb/testsuite/gdb.base/hstop-frame.exp +@V@/gdb/testsuite/gdb.base/print-file-var-lib1.c @V@/gdb/testsuite/gdb.base/pfv-lib1.c +@V@/gdb/testsuite/gdb.base/print-file-var-lib2.c @V@/gdb/testsuite/gdb.base/pfv-lib2.c +@V@/gdb/testsuite/gdb.base/print-file-var-main.c @V@/gdb/testsuite/gdb.base/pfv-main.c +@V@/gdb/testsuite/gdb.base/print-file-var.exp @V@/gdb/testsuite/gdb.base/pfv.exp @V@/gdb/testsuite/gdb.base/return-nodebug1.c @V@/gdb/testsuite/gdb.base/return-1nodebug.c @V@/gdb/testsuite/gdb.base/siginfo-addr.c @V@/gdb/testsuite/gdb.base/si-addr.c @V@/gdb/testsuite/gdb.base/siginfo-obj.c @V@/gdb/testsuite/gdb.base/si-obj.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index adadbd7579e..67192d9e717 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-05-10 Joel Brobecker + + * config/djgpp/fnchange.lst: Add entries for print-file-var-lib1.c, + print-file-var-lib2.c, print-file-var-main.c and + print-file-var.exp (located in gdb/testsuite/gdb.base). + 2012-05-10 Joel Brobecker * gdb.base/ctxobj-f.c, gdb.base/ctxobj-m.c, gdb.base/ctxobj-v.c, diff --git a/gdb/testsuite/gdb.base/print-file-var-lib1.c b/gdb/testsuite/gdb.base/print-file-var-lib1.c new file mode 100644 index 00000000000..dc9d03d5e11 --- /dev/null +++ b/gdb/testsuite/gdb.base/print-file-var-lib1.c @@ -0,0 +1,23 @@ +/* This testcase is part of GDB, the GNU debugger. + Copyright 2012 Free Software Foundation, Inc. + + 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 . */ + +int this_version_id = 104; + +int +get_version_1 (void) +{ + return this_version_id; +} diff --git a/gdb/testsuite/gdb.base/print-file-var-lib2.c b/gdb/testsuite/gdb.base/print-file-var-lib2.c new file mode 100644 index 00000000000..1803cb251bc --- /dev/null +++ b/gdb/testsuite/gdb.base/print-file-var-lib2.c @@ -0,0 +1,23 @@ +/* This testcase is part of GDB, the GNU debugger. + Copyright 2012 Free Software Foundation, Inc. + + 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 . */ + +int this_version_id = 203; + +int +get_version_2 (void) +{ + return this_version_id; +} diff --git a/gdb/testsuite/gdb.base/print-file-var-main.c b/gdb/testsuite/gdb.base/print-file-var-main.c new file mode 100644 index 00000000000..b8baf0f530e --- /dev/null +++ b/gdb/testsuite/gdb.base/print-file-var-main.c @@ -0,0 +1,29 @@ +/* This testcase is part of GDB, the GNU debugger. + Copyright 2012 Free Software Foundation, Inc. + + 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 . */ + +extern int get_version_1 (void); +extern int get_version_2 (void); + +int +main (void) +{ + if (get_version_1 () != 104) + return 1; + if (get_version_2 () != 104) + return 2; + return 0; +} + diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp new file mode 100644 index 00000000000..67c3ac481c3 --- /dev/null +++ b/gdb/testsuite/gdb.base/print-file-var.exp @@ -0,0 +1,55 @@ +# Copyright 2012 Free Software Foundation, Inc. + +# 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 . */ + +set executable print-file-var-main + +set lib1 "print-file-var-lib1" +set lib2 "print-file-var-lib2" + +set libobj1 "${objdir}/${subdir}/${lib1}.so" +set libobj2 "${objdir}/${subdir}/${lib2}.so" + +set lib_opts { debug additional_flags=-fPIC } + +if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1}.c \ + ${libobj1} \ + ${lib_opts} ] != "" } { + return -1 +} +if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2}.c \ + ${libobj2} \ + ${lib_opts} ] != "" } { + return -1 +} +if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \ + "${objdir}/${subdir}/${executable}" \ + executable \ + [list debug shlib=${libobj1} shlib=${libobj2}]] + != ""} { + return -1 +} + +clean_restart $executable + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +gdb_test "print 'print-file-var-lib1.c'::this_version_id" \ + " = 104" + +gdb_test "print 'print-file-var-lib2.c'::this_version_id" \ + " = 203" -- 2.30.2