aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2012-05-10 16:25:19 +0000
committerJoel Brobecker <brobecker@gnat.com>2012-05-10 16:25:19 +0000
commit64ea88dcd7fe63b28761aed765bce1cf0cd5f709 (patch)
treecb5ac4e06393c7596214856aa72f97d3171629ab /gdb
parentafba63f1097f74fae4a47fdb02d640b61f13f4ae (diff)
downloadgdb-64ea88dcd7fe63b28761aed765bce1cf0cd5f709.zip
gdb-64ea88dcd7fe63b28761aed765bce1cf0cd5f709.tar.gz
gdb-64ea88dcd7fe63b28761aed765bce1cf0cd5f709.tar.bz2
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).
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/config/djgpp/fnchange.lst4
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/print-file-var-lib1.c23
-rw-r--r--gdb/testsuite/gdb.base/print-file-var-lib2.c23
-rw-r--r--gdb/testsuite/gdb.base/print-file-var-main.c29
-rw-r--r--gdb/testsuite/gdb.base/print-file-var.exp55
7 files changed, 146 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01f4be9..31a3794 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2012-05-10 Joel Brobecker <brobecker@adacore.com>
+ * 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 <brobecker@adacore.com>
+
* findvar.c (default_read_var_value): For LOC_UNRESOLVED symbols,
try locating the symbol in the symbol's own objfile first, before
extending the search to all objfiles.
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index 59e456e..7d5ea82 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 adadbd7..67192d9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2012-05-10 Joel Brobecker <brobecker@adacore.com>
+ * 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 <brobecker@adacore.com>
+
* gdb.base/ctxobj-f.c, gdb.base/ctxobj-m.c, gdb.base/ctxobj-v.c,
gdb.base/ctxobj.exp: New files.
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 0000000..dc9d03d
--- /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 <http://www.gnu.org/licenses/>. */
+
+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 0000000..1803cb2
--- /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 <http://www.gnu.org/licenses/>. */
+
+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 0000000..b8baf0f
--- /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 <http://www.gnu.org/licenses/>. */
+
+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 0000000..67c3ac4
--- /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 <http://www.gnu.org/licenses/>. */
+
+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"