gdb/testsuite: link some dwarf2 tests with nopie

[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 07fde0e97f742cea1b0a99b919187a7d838da56e..fdbe9ed5928f4a84a96e725f4b7b6463bfa9116d 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, 2011 Free Software Foundation, Inc.
+# Copyright 2007-2020 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
@@ -19,7 +19,7 @@ if {![dwarf2_support]} {
     return 0  
 }
 
-if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
     return -1
 }
 
@@ -34,52 +34,49 @@ if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.
 # 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:"
+    with_test_prefix "$type" {
 
-    global gdb_prompt
+       global gdb_prompt
 
-    gdb_test "print file_locaddr_resolvable" "= 1234567890"
-    gdb_test "ptype file_locaddr_resolvable" "type = int"
+       gdb_test "print file_locaddr_resolvable" "= 1234567890"
+       gdb_test "ptype file_locaddr_resolvable" "type = int"
 
-    gdb_test "print file_locaddr_unresolvable" "= 1234567890"
-    gdb_test "ptype file_locaddr_unresolvable" "type = int"
+       gdb_test "print file_locaddr_unresolvable" "= 1234567890"
+       gdb_test "ptype file_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_locempty_resolvable" "= <optimized out>"
-    gdb_test "ptype file_locempty_resolvable" "type = int"
+       gdb_test "print file_locempty_resolvable" "= <optimized out>"
+       gdb_test "ptype file_locempty_resolvable" "type = int"
 
-    gdb_test "print file_locempty_unresolvable" "= <optimized out>"
-    gdb_test "ptype file_locempty_unresolvable" "type = int"
+       gdb_test "print file_locempty_unresolvable" "= <optimized out>"
+       gdb_test "ptype file_locempty_unresolvable" "type = int"
 
-    gdb_test "print file_locno_resolvable" "= <optimized out>"
-    gdb_test "ptype file_locno_resolvable" "type = int"
+       gdb_test "print file_locno_resolvable" "= <optimized out>"
+       gdb_test "ptype file_locno_resolvable" "type = int"
 
-    gdb_test "print file_locno_unresolvable" "= <optimized out>"
-    gdb_test "ptype file_locno_unresolvable" "type = int"
+       gdb_test "print file_locno_unresolvable" "= <optimized out>"
+       gdb_test "ptype file_locno_unresolvable" "type = int"
 
-    gdb_test "print file_extern_locaddr_resolvable" "= 1234567890"
-    gdb_test "ptype file_extern_locaddr_resolvable" "type = int"
+       gdb_test "print file_extern_locaddr_resolvable" "= 1234567890"
+       gdb_test "ptype file_extern_locaddr_resolvable" "type = int"
 
-    gdb_test "print file_extern_locaddr_unresolvable" "= 1234567890"
-    gdb_test "ptype file_extern_locaddr_unresolvable" "type = int"
+       gdb_test "print file_extern_locaddr_unresolvable" "= 1234567890"
+       gdb_test "ptype file_extern_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_extern_locempty_resolvable" "= <optimized out>"
-    gdb_test "ptype file_extern_locempty_resolvable" "type = int"
+       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" "= <optimized out>"
-    gdb_test "ptype file_extern_locempty_unresolvable" "type = int"
+       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"
-    gdb_test "ptype file_extern_locno_resolvable" "type = int"
+       gdb_test "print file_extern_locno_resolvable" "= 1234567890"
+       gdb_test "ptype file_extern_locno_resolvable" "type = int"
 
-    # `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 <optimized out>.  As usefulness of such DIE is not
-    # clear its resolution is not being tested.
-
-    set pf_prefix $old_prefix
+       # `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 <optimized out>.  As usefulness of such DIE is not
+       # clear its resolution is not being tested.
+    }
 }
 
 file_symbols no-run