Clean up testsuite compiler_info support.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cp / nextoverthrow.exp

diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp
index cc9fe86e3bc272c38e1b393482a8fa8cfa9aecd1..00e25b9cd8e919d9adcedc23866006eb56128427 100644 (file)
--- a/gdb/testsuite/gdb.cp/nextoverthrow.exp
+++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright 2008-2015 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
@@ -14,19 +14,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 if { [skip_cplus_tests] } { continue }
 
-set testfile "nextoverthrow"
-set srcfile ${testfile}.cc
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
-if [get_compiler_info ${binfile} "c++"] {
+if [get_compiler_info "c++"] {
     untested nextoverthrow.exp
     return -1
 }
@@ -40,24 +34,7 @@ if ![runto_main] then {
     continue
 } 
 
-# See whether we have the needed unwinder hooks.
-set ok 1
-gdb_test_multiple "print _Unwind_DebugHook" "check for unwinder hook" {
-    -re "= .*no debug info.*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
-       # Pass the test so we don't get bogus fails in the results.
-       pass "check for unwinder hook"
-       set ok 0
-    }
-    -re "= .*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
-       pass "check for unwinder hook"
-    }
-    -re "No symbol .* in current context.\r\n$gdb_prompt $" {
-       # Pass the test so we don't get bogus fails in the results.
-       pass "check for unwinder hook"
-       set ok 0
-    }
-}
-if {!$ok} {
+if {![skip_unwinder_tests]} {
     unsupported "nextoverthrow.exp could not find _Unwind_DebugHook"
     return -1
 }