* gdb.threads/tls.exp ("info address me"): Fix expected output.

2 files changed, 33 insertions, 29 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9350d17..c8ca29c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* gdb.threads/tls.exp ("info address me"): Fix expected output.
+
 2011-01-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* configure: Regenerate.
@@ -8,30 +12,30 @@
 
 2011-01-06  Joel Brobecker  <brobecker@adacore.com>
 
-        * gdb.ada/array_bounds.exp, gdb.ada/array_return.exp,
-        gdb.ada/array_subscript_addr.exp, gdb.ada/arrayidx.exp,
-        gdb.ada/arrayparam.exp, gdb.ada/arrayptr.exp,
-        gdb.ada/atomic_enum.exp, gdb.ada/call_pn.exp,
-        gdb.ada/catch_ex.exp, gdb.ada/char_param.exp,
-        gdb.ada/complete.exp, gdb.ada/exprs.exp, gdb.ada/fixed_cmp.exp,
-        gdb.ada/fixed_points.exp, gdb.ada/formatted_ref.exp,
-        gdb.ada/frame_args.exp, gdb.ada/fun_addr.exp,
-        gdb.ada/fun_in_declare.exp, gdb.ada/funcall_param.exp,
-        gdb.ada/homonym.exp, gdb.ada/int_deref.exp,
-        gdb.ada/interface.exp, gdb.ada/lang_switch.exp,
-        gdb.ada/mod_from_name.exp, gdb.ada/nested.exp,
-        gdb.ada/null_array.exp, gdb.ada/null_record.exp,
-        gdb.ada/packed_array.exp, gdb.ada/packed_tagged.exp,
-        gdb.ada/print_chars.exp, gdb.ada/print_pc.exp,
-        gdb.ada/ptype_field.exp, gdb.ada/ptype_tagged_param.exp,
-        gdb.ada/rec_return.exp, gdb.ada/ref_param.exp,
-        gdb.ada/ref_tick_size.exp, gdb.ada/start.exp,
-        gdb.ada/str_ref_cmp.exp, gdb.ada/sym_print_name.exp,
-        gdb.ada/taft_type.exp, gdb.ada/tagged.exp, gdb.ada/tasks.exp,
-        gdb.ada/tick_last_segv.exp, gdb.ada/type_coercion.exp,
-        gdb.ada/uninitialized_vars.exp,
-        gdb.ada/variant_record_packed_array.exp, gdb.ada/watch_arg.exp:
-        Simplify by using clean_restart.
+	* gdb.ada/array_bounds.exp, gdb.ada/array_return.exp,
+	gdb.ada/array_subscript_addr.exp, gdb.ada/arrayidx.exp,
+	gdb.ada/arrayparam.exp, gdb.ada/arrayptr.exp,
+	gdb.ada/atomic_enum.exp, gdb.ada/call_pn.exp,
+	gdb.ada/catch_ex.exp, gdb.ada/char_param.exp,
+	gdb.ada/complete.exp, gdb.ada/exprs.exp, gdb.ada/fixed_cmp.exp,
+	gdb.ada/fixed_points.exp, gdb.ada/formatted_ref.exp,
+	gdb.ada/frame_args.exp, gdb.ada/fun_addr.exp,
+	gdb.ada/fun_in_declare.exp, gdb.ada/funcall_param.exp,
+	gdb.ada/homonym.exp, gdb.ada/int_deref.exp,
+	gdb.ada/interface.exp, gdb.ada/lang_switch.exp,
+	gdb.ada/mod_from_name.exp, gdb.ada/nested.exp,
+	gdb.ada/null_array.exp, gdb.ada/null_record.exp,
+	gdb.ada/packed_array.exp, gdb.ada/packed_tagged.exp,
+	gdb.ada/print_chars.exp, gdb.ada/print_pc.exp,
+	gdb.ada/ptype_field.exp, gdb.ada/ptype_tagged_param.exp,
+	gdb.ada/rec_return.exp, gdb.ada/ref_param.exp,
+	gdb.ada/ref_tick_size.exp, gdb.ada/start.exp,
+	gdb.ada/str_ref_cmp.exp, gdb.ada/sym_print_name.exp,
+	gdb.ada/taft_type.exp, gdb.ada/tagged.exp, gdb.ada/tasks.exp,
+	gdb.ada/tick_last_segv.exp, gdb.ada/type_coercion.exp,
+	gdb.ada/uninitialized_vars.exp,
+	gdb.ada/variant_record_packed_array.exp, gdb.ada/watch_arg.exp:
+	Simplify by using clean_restart.
 
 2011-01-06  Joel Brobecker  <brobecker@adacore.com>
 
@@ -174,7 +178,7 @@
 
 2010-11-29  Phil Muldoon  <pmuldoon@redhat.com>
 
-        PR python/12199
+	PR python/12199
 
 	* gdb.python/py-breakpoint.exp: Test the delete method.
 
@@ -579,7 +583,7 @@
 	* gdb.dwarf2/dw2-const.S, gdb.dwarf2/dw2-const.exp: New files.
 
 2010-09-16  Phil Muldoon  <pmuldoon@redhat.com>
-            Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	PR mi/11407
 	* gdb.mi/dw2-ref-missing-frame-func.c: New File.
@@ -677,7 +681,7 @@
 	* gdb.base/ui-redirect.exp: New file.
 
 2010-09-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
-            Joel Brobecker  <brobecker@adacore.com>
+	    Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.dwarf/dw2-filename.S, gdb.dwarf/dw2-filename.exp: New files.
 
@@ -4777,7 +4781,7 @@
 2009-05-11  Doug Evans  <dje@sebabeach.org>
 
 	* gdb.mi/nsintrall.c (main): Fix off-by-one error.
-	* gdb.threads/pending-step.c (main): Fix off-by-one error. 
+	* gdb.threads/pending-step.c (main): Fix off-by-one error.
 	* gdb.threads/schedlock.c (main): Fix off-by-one error.
 
 2009-05-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 62f504f..0e63120 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -284,7 +284,7 @@ runto spin
 gdb_test "info address a_global" \
 	".*a_global.*static storage at address.*" "info address a_global"
 
-gdb_test "info address me" ".*me.*is a complex DWARF expression:.*" \
+gdb_test "info address me" ".*me.*is a (complex DWARF expression:|variable).*" \
     "info address me"