Index: py-symbol.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-symbol.c,v
retrieving revision 1.6
diff -u -p -r1.6 py-symbol.c
--- py-symbol.c	3 May 2012 07:07:26 -0000	1.6
+++ py-symbol.c	5 May 2012 06:36:41 -0000
@@ -44,10 +44,11 @@ int func (int arg)
   return arg; /* Block break here.  */
 }
 
-struct simple_struct
+static int
+static_func (int a, int b)
 {
-  int a;
-};
+  return a + b;
+}
 
 int main (int argc, char *argv[])
 {
@@ -55,12 +56,12 @@ int main (int argc, char *argv[])
   SimpleClass sclass;
 #endif
   int a = 0;
-  int result;
-  struct simple_struct ss = { 10 };
+  int result, result1;
   enum tag {one, two, three};
   enum tag t = one;
 
   result = func (42);
+  result1 = static_func (5, 10);
 
 #ifdef __cplusplus
   sclass.seti (42);
Index: py-symtab.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-symtab.exp,v
retrieving revision 1.9
diff -u -p -r1.9 py-symtab.exp
--- py-symtab.exp	3 May 2012 07:07:26 -0000	1.9
+++ py-symtab.exp	5 May 2012 06:36:41 -0000
@@ -71,7 +71,7 @@ gdb_test "python print \"func\" in globa
 gdb_test "python print \"main\" in global_symbols" "True" "Test main in global symbols"
 gdb_test "python print \"int\" in static_symbols" "True" "Test int in static symbols"
 gdb_test "python print \"char\" in static_symbols" "True" "Test char in static symbols"
-gdb_test "python print \"simple_struct\" in static_symbols" "True" "Test simple_struct in static symbols"
+gdb_test "python print \"static_func\" in static_symbols" "True" "Test static_func in static symbols"
 
 # Test is_valid when the objfile is unloaded.  This must be the last
 # test as it unloads the object file in GDB.