mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-05 12:53:16 +08:00
ac45a6ca51
In trying to resolve the duplicate test names for the gdb.cp/nsusing.exp script, I ended up giving the test script a serious spring clean. This reverts some of the changes introduced in commitdf83a9bf8b, but I don't think that we have lost any testing. The test program is made of many functions, the test script wants to stop in different functions and check which symbols are in scope. Previously the test script would either restart GDB completely in order to "progress" to the next function, or the script would restart the test program using 'runto'. In this commit I have reordered the steps of the test to correspond to program order, I then progress through the test program once by just placing a breakpoint and then continuing. As I said, the test is checking which symbols are in scope at each location, so the exact order of the tests doesn't matter, so long as we check the correct symbols at each location. I have also given the comments capital letters and full stops, and re-wrapped them to a more sensible line length. There was a duplicate test block introduced in thedf83a9bf8bcommit which I have removed in this commit, this duplicate code was responsible for one of the duplicate test names. The other duplicate test name was due to the same command being run at different locations, in this case I just gave the two tests explicit, unique, names. gdb/testsuite/ChangeLog: * gdb.cp/nsusing.exp: Rewrite test, remove a duplicate test block. Avoid repeated uses of 'runto', and instread just progress once through the test stopping at different breakpoints. Give comments a capital letter and full stop. Give duplicate tests unique names.
132 lines
3.7 KiB
Plaintext
132 lines
3.7 KiB
Plaintext
# Copyright 2008-2021 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/>.
|
|
|
|
standard_testfile .cc
|
|
|
|
if [get_compiler_info] {
|
|
return -1
|
|
}
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
|
|
return -1
|
|
}
|
|
|
|
############################################
|
|
# Test printing of namespace imported within the function.
|
|
|
|
if ![runto_main] then {
|
|
perror "couldn't run to breakpoint main"
|
|
continue
|
|
}
|
|
|
|
gdb_test "print _a" "= 1"
|
|
|
|
############################################
|
|
# Test printing of namespace imported into a scope containing the pc.
|
|
|
|
gdb_breakpoint [gdb_get_line_number "marker1 stop"]
|
|
gdb_continue_to_breakpoint "marker1 stop"
|
|
|
|
gdb_test "print _a" "= 1" "print _a in a nested scope"
|
|
|
|
############################################
|
|
# Test printing of namespace aliases.
|
|
|
|
gdb_breakpoint marker2
|
|
gdb_continue_to_breakpoint "marker2"
|
|
|
|
gdb_test "print B::_a" "= 1"
|
|
|
|
gdb_test "print _a" "No symbol \"_a\" in current context." \
|
|
"print _a in namespace alias scope"
|
|
|
|
gdb_test "print x" "No symbol \"x\" in current context." \
|
|
"print x in namespace alias scope"
|
|
|
|
############################################
|
|
# Test that names are not printed when they
|
|
# are not imported.
|
|
|
|
gdb_breakpoint marker3
|
|
gdb_continue_to_breakpoint "marker3"
|
|
|
|
# gcc-4-3 puts import statements for aliases in
|
|
# the global scope instead of the corresponding
|
|
# function scope. These wrong import statements throw
|
|
# this test off. This is fixed in gcc-4-4.
|
|
if [test_compiler_info gcc-4-3-*] then { setup_xfail *-*-* }
|
|
|
|
gdb_test "print _a" "No symbol \"_a\" in current context." \
|
|
"Print _a without import at marker3"
|
|
|
|
############################################
|
|
# Test printing of individually imported elements.
|
|
|
|
gdb_breakpoint marker4
|
|
gdb_continue_to_breakpoint "marker4"
|
|
|
|
gdb_test "print dx" "= 4"
|
|
|
|
############################################
|
|
# Test printing of namespace imported into file scope.
|
|
|
|
gdb_breakpoint marker5
|
|
gdb_continue_to_breakpoint "marker5"
|
|
|
|
gdb_test "print cc" "= 3"
|
|
|
|
# Also test printing of namespace aliases
|
|
|
|
gdb_test "print efx" "= 5"
|
|
|
|
############################################
|
|
# Test printing of variables imported from nested namespaces.
|
|
|
|
gdb_breakpoint I::marker7
|
|
gdb_continue_to_breakpoint "I::marker7"
|
|
|
|
gdb_test "print ghx" "= 6"
|
|
|
|
############################################
|
|
# Test that variables are not printed in a namespace that is sibling
|
|
# to the namespace containing an import.
|
|
|
|
gdb_breakpoint L::marker8
|
|
gdb_continue_to_breakpoint "L::marker8"
|
|
|
|
gdb_test "print jx" "= 44" \
|
|
"print jx when the symbol is available"
|
|
|
|
gdb_breakpoint "K::marker9"
|
|
gdb_continue_to_breakpoint "K::marker9"
|
|
|
|
gdb_test "print jx" "No symbol \"jx\" in current context." \
|
|
"print jx when the symbol is not available"
|
|
|
|
############################################
|
|
# Test that variables are only printed after the line containing the
|
|
# import.
|
|
|
|
gdb_breakpoint [gdb_get_line_number "marker10 stop"]
|
|
gdb_continue_to_breakpoint "marker10 stop"
|
|
|
|
if { [test_compiler_info {gcc-[0-3]-*}] ||
|
|
[test_compiler_info {gcc-4-[0-3]-*}]} {
|
|
setup_xfail *-*-*
|
|
}
|
|
|
|
# Assert that M::x is printed and not N::x
|
|
gdb_test "print x" "= 911" "print x (from M::x)"
|