Merge GDB 7.5.1

gdb/testsuite/gdb.python/py-type.exp

 # Copyright (C) 2009-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/>.
 
 # This file is part of the GDB testsuite.  It tests the mechanism
 # of exposing types to Python.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 load_lib gdb-python.exp
 
-set testfile "py-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-if [get_compiler_info not-used c++] {
+if [get_compiler_info c++] {
     return -1;
 }
 
 # Build inferior to language specification.
 proc build_inferior {exefile lang} {
   global srcdir subdir srcfile testfile hex
 
   if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${exefile}" executable "debug $lang"] != "" } {
       untested "Couldn't compile ${srcfile} in $lang mode"
       return -1
@@ skipping 43 matching lines @@
   }
 
   # Test normal fields usage in structs.
   gdb_py_test_silent_cmd "print st" "print value" 1
   gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value from history" 1
   gdb_py_test_silent_cmd "python fields = st.type.fields()" "get fields" 1
   gdb_test "python print len(fields)" "2" "Check number of fields"
   gdb_test "python print fields\[0\].name" "a" "Check structure field a name"
   gdb_test "python print fields\[1\].name" "b" "Check structure field b name"
 
+  # Regression test for
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12070.
+  gdb_test "python print 'type' in dir(fields\[0\])" "True" \
+    "Check that dir includes name"
+
   # Test Python mapping behavior of gdb.Type for structs/classes
   gdb_test "python print len(st.type)" "2" "Check number of fields"
   gdb_test "python print st.type\['a'\].name" "a" "Check fields lookup by name"
     gdb_test "python print \[v.bitpos for v in st.type.itervalues()\]" {\[0L, 32L\]} "Check fields iteration over values"
     gdb_test "python print \[(n, v.bitpos) for (n, v) in st.type.items()\]" {\[\('a', 0L\), \('b', 32L\)\]} "Check fields items list"
   gdb_test "python print 'a' in st.type" "True" "Check field name exists test"
   gdb_test "python print 'nosuch' in st.type" "False" "Check field name nonexists test"
   gdb_test "python print not not st.type" "True" "Check conversion to bool"
 
   # Test rejection of mapping operations on scalar types
@@ skipping 25 matching lines @@
   gdb_py_test_silent_cmd "python e = gdb.history (0)" "get value from  history" 1
   gdb_py_test_silent_cmd "python fields = e.type.fields()" "get value from history" 1
   gdb_test "python print len(fields)" "3" "Check the number of enum fields"
   gdb_test "python print fields\[0\].name" "v1" "Check enum field name"
   gdb_test "python print fields\[1\].name" "v2" "Check enum field name"
 
   # Ditto but by mapping operations
   gdb_test "python print len(e.type)" "3" "Check the number of enum fields"
   gdb_test "python print e.type\['v1'\].name" "v1" "Check enum field lookup by name"
   gdb_test "python print e.type\['v3'\].name" "v3" "Check enum field lookup by name"
-    gdb_test "python print \[v.bitpos for v in e.type.itervalues()\]" {\[0L, 1L, 2L\]} "Check num fields iteration over values"
-    gdb_test "python print \[(n, v.bitpos) for (n, v) in e.type.items()\]" {\[\('v1', 0L\), \('v2', 1L\), \('v3', 2L\)\]} "Check enum fields items list"
+    gdb_test "python print \[v.enumval for v in e.type.itervalues()\]" {\[0L, 1L, 2L\]} "Check num fields iteration over values"
+    gdb_test "python print \[(n, v.enumval) for (n, v) in e.type.items()\]" {\[\('v1', 0L\), \('v2', 1L\), \('v3', 2L\)\]} "Check enum fields items list"
 }
 proc test_base_class {} {
   gdb_py_test_silent_cmd "print d" "print value" 1
   gdb_py_test_silent_cmd "python d = gdb.history (0)" "get value from  history" 1
   gdb_py_test_silent_cmd "python fields = d.type.fields()" "get value from history" 1
   gdb_test "python print len(fields)" "3" "Check the number of fields"
   gdb_test "python print fields\[0\].is_base_class" "True" "Check base class"
   gdb_test "python print fields\[1\].is_base_class" "False" "Check base class"
 }
 
@@ skipping 36 matching lines @@
     if {[test_compiler_info {gcc-[0-3]-*}]
         || [test_compiler_info {gcc-4-[0-4]-*}]} {
         set have_older_gcc 1
     }
     if $have_older_gcc { setup_xfail *-*-* }
     gdb_test "python print ttype.template_argument(1)" "23"
     if $have_older_gcc { setup_xfail *-*-* }
     gdb_test "python print isinstance(ttype.template_argument(1), gdb.Value)" \
         "True"
 
-    setup_kfail "gcc/41736" *-*-*
+    if {[test_compiler_info {gcc-[0-3]-*}]
+        || [test_compiler_info {gcc-4-[0-5]-*}]} {
+        setup_xfail "gcc/46955" *-*-*
+    }
     gdb_test "python print ttype.template_argument(2)" "&C::c"
 }
 
 # Perform C Tests.
 build_inferior "${binfile}" "c"
 restart_gdb "${binfile}"
 
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
 runto_bp "break to inspect struct and array."
 test_fields "c"
 test_enums
 
 # Perform C++ Tests.
 build_inferior "${binfile}-cxx" "c++"
 restart_gdb "${binfile}-cxx"
 runto_bp "break to inspect struct and array."
 test_fields "c++"
 test_base_class
 test_range
 test_template
 test_enums