From 2db19d1e4d5a7f5ceae208d32ef452e3e40f562c Mon Sep 17 00:00:00 2001 From: Sami Wagiaalla Date: Mon, 31 Jan 2011 18:29:02 +0000 Subject: [PATCH] Added new namespace tests. 2011-01-31 Sami Wagiaalla * gdb.cp/nsnested.cc: New. * gdb.cp/nsnested.exp: New. * gdb.cp/nsnoimports.exp: New. * gdb.cp/nsnoimports.cc: New. --- gdb/testsuite/ChangeLog | 7 ++++ gdb/testsuite/gdb.cp/nsnested.cc | 36 ++++++++++++++++ gdb/testsuite/gdb.cp/nsnested.exp | 42 +++++++++++++++++++ gdb/testsuite/gdb.cp/nsnoimports.cc | 37 +++++++++++++++++ gdb/testsuite/gdb.cp/nsnoimports.exp | 61 ++++++++++++++++++++++++++++ 5 files changed, 183 insertions(+) create mode 100644 gdb/testsuite/gdb.cp/nsnested.cc create mode 100644 gdb/testsuite/gdb.cp/nsnested.exp create mode 100644 gdb/testsuite/gdb.cp/nsnoimports.cc create mode 100644 gdb/testsuite/gdb.cp/nsnoimports.exp diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d05b6e6956..5ac3c0cea9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-01-31 Sami Wagiaalla + + * gdb.cp/nsnested.cc: New. + * gdb.cp/nsnested.exp: New. + * gdb.cp/nsnoimports.exp: New. + * gdb.cp/nsnoimports.cc: New. + 2011-01-31 Joel Brobecker * gdb.base/interact.exp: Add extra tests that verify that diff --git a/gdb/testsuite/gdb.cp/nsnested.cc b/gdb/testsuite/gdb.cp/nsnested.cc new file mode 100644 index 0000000000..9723f874d9 --- /dev/null +++ b/gdb/testsuite/gdb.cp/nsnested.cc @@ -0,0 +1,36 @@ +namespace A +{ + namespace B + { + int ab = 11; + } +} + +namespace C +{ + namespace D + { + using namespace A::B; + + int + second() + { + ab; + return 0; + } + } + + int + first() + { + //ab; + return D::second(); + } +} + +int +main() +{ + //ab; + return C::first(); +} diff --git a/gdb/testsuite/gdb.cp/nsnested.exp b/gdb/testsuite/gdb.cp/nsnested.exp new file mode 100644 index 0000000000..6648f38849 --- /dev/null +++ b/gdb/testsuite/gdb.cp/nsnested.exp @@ -0,0 +1,42 @@ +# Copyright 2011 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 testfile nsnested +set srcfile ${testfile}.cc +set binfile ${objdir}/${subdir}/${testfile} +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { + return -1 +} + +############################################ +if ![runto_main] then { + perror "couldn't run to breakpoint main" + continue +} + +gdb_test "print ab" "No symbol .* in current context." + +############################################ +gdb_breakpoint C::first +gdb_continue_to_breakpoint "C::first" + +gdb_test "print ab" "No symbol .* in current context." +gdb_test "print C::D::ab" "= 11" + +############################################ +gdb_breakpoint C::D::second +gdb_continue_to_breakpoint "C::D::second" + +gdb_test "print ab" "= 11" diff --git a/gdb/testsuite/gdb.cp/nsnoimports.cc b/gdb/testsuite/gdb.cp/nsnoimports.cc new file mode 100644 index 0000000000..d1c68abaea --- /dev/null +++ b/gdb/testsuite/gdb.cp/nsnoimports.cc @@ -0,0 +1,37 @@ + +namespace A +{ + int _a = 11; + + namespace B{ + + int ab = 22; + + namespace C{ + + int abc = 33; + + int second(){ + return 0; + } + + } + + int first(){ + _a; + ab; + C::abc; + return C::second(); + } + } +} + + +int +main() +{ + A::_a; + A::B::ab; + A::B::C::abc; + return A::B::first(); +} diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp new file mode 100644 index 0000000000..7b3dc2fb50 --- /dev/null +++ b/gdb/testsuite/gdb.cp/nsnoimports.exp @@ -0,0 +1,61 @@ +# Copyright 2011 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 testfile nsnoimports +set srcfile ${testfile}.cc +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { + return -1 +} + +############################################ +if ![runto_main] then { + perror "couldn't run to breakpoint main" + continue +} + +gdb_test "print A::_a" "= 11" +gdb_test "print A::B::ab" "= 22" +gdb_test "print A::B::C::abc" "= 33" + +gdb_test "print _a" "No symbol .* in current context." +gdb_test "print ab" "No symbol .* in current context." +gdb_test "print abc" "No symbol .* in current context." + +############################################ +gdb_breakpoint A::B::first +gdb_continue_to_breakpoint "A::B::first" + +gdb_test "print A::_a" "= 11" +gdb_test "print A::B::ab" "= 22" +gdb_test "print A::B::C::abc" "= 33" + +gdb_test "print _a" "= 11" +gdb_test "print ab" "= 22" +gdb_test "print C::abc" "= 33" + +gdb_test "print abc" "No symbol .* in current context." + +############################################ +gdb_breakpoint A::B::C::second +gdb_continue_to_breakpoint "A::B::C::second" + +gdb_test "print A::_a" "= 11" +gdb_test "print A::B::ab" "= 22" +gdb_test "print A::B::C::abc" "= 33" + +gdb_test "print _a" "= 11" +gdb_test "print ab" "= 22" +gdb_test "print abc" "= 33" +