gdb/testsuite: add simavr.exp board

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

diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index fb9df5caf9d67ab07bf752c702f5ff8c1661a38e..34b46ed52507b17e746c00729c02c4d6968f0c0f 100644 (file)
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -1,4 +1,4 @@
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-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
@@ -24,7 +24,7 @@ if { [get_compiler_info "c++"] } {
     return -1
 }
 
-if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
     return -1
 }
 
@@ -292,7 +292,7 @@ proc info_func_regexp { name demangled } {
     regsub {\\\(void\\\)} $demangled {\(\)} demangled
 
     gdb_test "info function $name" \
-       "File .*:\r\n(class|)${demangled}.*" \
+       "File .*:\t(class|)${demangled}.*" \
        "info function for \"$name\""
 }