2012-02-21 Pedro Alves <palves@redhat.com>

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.dwarf2 / dw2-noloc.exp

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
index 2c336efc17b01d658b69802cf54dde799aae0302..9a6cb2a01997cc7977f53e444764892d0c6f76a6 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
@@ -1,4 +1,4 @@
-# Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2007-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
@@ -12,15 +12,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
-# For now pick a sampling of likely targets.
-if {![istarget *-*-linux*]
-    && ![istarget *-*-gnu*]
-    && ![istarget *-*-elf*]
-    && ![istarget *-*-openbsd*]
-    && ![istarget arm-*-eabi*]
-    && ![istarget powerpc-*-eabi*]} {
+if {![dwarf2_support]} {
     return 0  
 }
 
@@ -38,10 +33,7 @@ if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.
 # unresolvable: .symtab entry does not exist for this symbol name.
 # DW_AT_declaration is not present in any of these DIEs.
 
-proc file_symbols {type} {
-    global pf_prefix
-    set old_prefix $pf_prefix
-    lappend pf_prefix "$type:"
+proc file_symbols {type} { with_test_prefix "$type" {
 
     global gdb_prompt
 
@@ -51,16 +43,16 @@ proc file_symbols {type} {
     gdb_test "print file_locaddr_unresolvable" "= 1234567890"
     gdb_test "ptype file_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_locempty_resolvable" "= <value optimized out>"
+    gdb_test "print file_locempty_resolvable" "= <optimized out>"
     gdb_test "ptype file_locempty_resolvable" "type = int"
 
-    gdb_test "print file_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "print file_locempty_unresolvable" "= <optimized out>"
     gdb_test "ptype file_locempty_unresolvable" "type = int"
 
-    gdb_test "print file_locno_resolvable" "= <value optimized out>"
+    gdb_test "print file_locno_resolvable" "= <optimized out>"
     gdb_test "ptype file_locno_resolvable" "type = int"
 
-    gdb_test "print file_locno_unresolvable" "= <value optimized out>"
+    gdb_test "print file_locno_unresolvable" "= <optimized out>"
     gdb_test "ptype file_locno_unresolvable" "type = int"
 
     gdb_test "print file_extern_locaddr_resolvable" "= 1234567890"
@@ -69,10 +61,10 @@ proc file_symbols {type} {
     gdb_test "print file_extern_locaddr_unresolvable" "= 1234567890"
     gdb_test "ptype file_extern_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_extern_locempty_resolvable" "= <value optimized out>"
+    gdb_test "print file_extern_locempty_resolvable" "= <optimized out>"
     gdb_test "ptype file_extern_locempty_resolvable" "type = int"
 
-    gdb_test "print file_extern_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "print file_extern_locempty_unresolvable" "= <optimized out>"
     gdb_test "ptype file_extern_locempty_unresolvable" "type = int"
 
     gdb_test "print file_extern_locno_resolvable" "= 1234567890"
@@ -81,11 +73,9 @@ proc file_symbols {type} {
     # `print file_extern_locno_unresolvable' currently prints
     # Address of symbol "file_extern_locno_unresolvable" is unknown.
     # As DW_AT_declaration is not present in this DIE
-    # it should print <value optimized out>.  As usefulness of such DIE is not
+    # it should print <optimized out>.  As usefulness of such DIE is not
     # clear its resolution is not being tested.
-
-    set pf_prefix $old_prefix
-}
+}}
 
 file_symbols no-run
 
@@ -102,16 +92,16 @@ gdb_test "ptype main_local_locaddr_resolvable" "type = int"
 gdb_test "print main_local_locaddr_unresolvable" "= 1234567890"
 gdb_test "ptype main_local_locaddr_unresolvable" "type = int"
 
-gdb_test "print main_local_locempty_resolvable" "= <value optimized out>"
+gdb_test "print main_local_locempty_resolvable" "= <optimized out>"
 gdb_test "ptype main_local_locempty_resolvable" "type = int"
 
-gdb_test "print main_local_locempty_unresolvable" "= <value optimized out>"
+gdb_test "print main_local_locempty_unresolvable" "= <optimized out>"
 gdb_test "ptype main_local_locempty_unresolvable" "type = int"
 
-gdb_test "print main_local_locno_resolvable" "= <value optimized out>"
+gdb_test "print main_local_locno_resolvable" "= <optimized out>"
 gdb_test "ptype main_local_locno_resolvable" "type = int"
 
-gdb_test "print main_local_locno_unresolvable" "= <value optimized out>"
+gdb_test "print main_local_locno_unresolvable" "= <optimized out>"
 gdb_test "ptype main_local_locno_unresolvable" "type = int"
 
 gdb_test "print main_extern_locaddr_resolvable" "= 1234567890"
@@ -120,10 +110,10 @@ gdb_test "ptype main_extern_locaddr_resolvable" "type = int"
 gdb_test "print main_extern_locaddr_unresolvable" "= 1234567890"
 gdb_test "ptype main_extern_locaddr_unresolvable" "type = int"
 
-gdb_test "print main_extern_locempty_resolvable" "= <value optimized out>"
+gdb_test "print main_extern_locempty_resolvable" "= <optimized out>"
 gdb_test "ptype main_extern_locempty_resolvable" "type = int"
 
-gdb_test "print main_extern_locempty_unresolvable" "= <value optimized out>"
+gdb_test "print main_extern_locempty_unresolvable" "= <optimized out>"
 gdb_test "ptype main_extern_locempty_unresolvable" "type = int"
 
 gdb_test "print main_extern_locno_resolvable" "= 1234567890"