diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/m-static.cc | 72 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/m-static.exp | 112 |
3 files changed, 190 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8a58911..cbb7271 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2002-05-30 Michael Chastain <mec@shout.net> +From Benjamin Kosnik <bkoz@redhat.com> + + * gdb.c++/m-static.cc: New file. + * gdb.c++/m-static.exp: New file. + 2002-05-28 Michael Snyder <msnyder@redhat.com> * gdb.base/call-ar-st.exp: Allow for reduced floating point diff --git a/gdb/testsuite/gdb.c++/m-static.cc b/gdb/testsuite/gdb.c++/m-static.cc new file mode 100644 index 0000000..2433801 --- /dev/null +++ b/gdb/testsuite/gdb.c++/m-static.cc @@ -0,0 +1,72 @@ +// 2002-05-13 + +namespace __gnu_test +{ + enum region { oriental, egyptian, greek, etruscan, roman }; + + // Test one. + class gnu_obj_1 + { + protected: + typedef region antiquities; + static const bool test = true; + static const int key1 = 5; + static long key2; + + static antiquities value; + + public: + gnu_obj_1(antiquities a, long l) {} + }; + + const bool gnu_obj_1::test; + const int gnu_obj_1::key1; + long gnu_obj_1::key2 = 77; + gnu_obj_1::antiquities gnu_obj_1::value = oriental; + + + // Test two. + template<typename T> + class gnu_obj_2: public virtual gnu_obj_1 + { + public: + static antiquities value_derived; + + public: + gnu_obj_2(antiquities b): gnu_obj_1(oriental, 7) { } + }; + + template<typename T> + typename gnu_obj_2<T>::antiquities gnu_obj_2<T>::value_derived = etruscan; + + // Test three. + template<typename T> + class gnu_obj_3 + { + public: + typedef region antiquities; + static gnu_obj_2<int> data; + + public: + gnu_obj_3(antiquities b) { } + }; + + template<typename T> + gnu_obj_2<int> gnu_obj_3<T>::data(etruscan); +} + +// instantiate templates explicitly so their static members will exist +template class __gnu_test::gnu_obj_2<int>; +template class __gnu_test::gnu_obj_2<long>; +template class __gnu_test::gnu_obj_3<long>; + +int main() +{ + using namespace __gnu_test; + + gnu_obj_1 test1(egyptian, 4589); + gnu_obj_2<long> test2(roman); + gnu_obj_3<long> test3(greek); + + return 0; +} diff --git a/gdb/testsuite/gdb.c++/m-static.exp b/gdb/testsuite/gdb.c++/m-static.exp new file mode 100644 index 0000000..c05983b --- /dev/null +++ b/gdb/testsuite/gdb.c++/m-static.exp @@ -0,0 +1,112 @@ +# Copyright 2002 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Tests for member static data +# 2002-05-13 Benjamin Kosnik <bkoz@redhat.com> + +# This file is part of the gdb testsuite + +if $tracelevel then { + strace $tracelevel + } + +if { [skip_cplus_tests] } { continue } + +# +# test running programs +# +set prms_id 0 +set bug_id 0 + +set testfile "m-static" +set srcfile ${testfile}.cc +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } { + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." +} + +if [get_compiler_info ${binfile} "c++"] { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + + +if ![runto_main] then { + perror "couldn't run to breakpoint" + continue +} + +# One. +gdb_test "break 68" "Breakpoint \[0-9\]*.*line 68\\." +gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-static\\.cc:68\r\n.*" "continue to 68" + +# simple object, static const bool +gdb_test "print test1.test" "\\$\[0-9\]* = true" "simple object, static const bool" + +# simple object, static const int +gdb_test "print test1.key1" "\\$\[0-9\]* = 5" "simple object, static const int" + +# simple object, static long +gdb_test "print test1.key2" "\\$\[0-9\]* = 77" "simple object, static long" + +# simple object, static enum +gdb_test "print test1.value" "\\$\[0-9\]* = oriental" "simple object, static enum" + +# Two. +gdb_test "break 69" "Breakpoint \[0-9\]*.*line 69\\." +gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-static\\.cc:69\r\n.*" "continue to 69" + +# derived template object, base static const bool +gdb_test "print test2.test" "\\$\[0-9\]* = true" "derived template object, base static const bool" + +# derived template object, base static const int +gdb_test "print test2.key1" "\\$\[0-9\]* = 5" "derived template object, base static const int" + +# derived template object, base static long +gdb_test "print test2.key2" "\\$\[0-9\]* = 77" "derived template object, base static long" + +# derived template object, base static enum +gdb_test "print test2.value" "\\$\[0-9\].* = oriental" "derived template object, base static enum" + +# derived template object, static enum +gdb_test "print test2.value_derived" "\\$\[0-9\].* = etruscan" "derived template object, static enum" + +# Three. +gdb_test "break 71" "Breakpoint \[0-9\]*.*line 71\\." +gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-static\\.cc:71\r\n.*" "continue to 71" + +# template object, static derived template data member's base static const bool +gdb_test "print test3.data.test" "\\$\[0-9\].* = true" "template object, static const bool" + +# template object, static derived template data member's base static const int +gdb_test "print test3.data.key1" "\\$\[0-9\].* = 5" "template object, static const int" + +# template object, static derived template data member's base static long +gdb_test "print test3.data.key2" "\\$\[0-9\].* = 77" "template object, static long" + +# template object, static derived template data member's base static enum +gdb_test "print test3.data.value" "\\$\[0-9\].* = oriental" "template object, static enum" + +# template object, static derived template data member's static enum +gdb_test "print test3.data.value_derived" "\\$\[0-9\].* = etruscan" "template object, static derived enum" + +gdb_exit +return 0 |