c++/24367: Infinite recursion of typedef substitution

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

diff --git a/gdb/testsuite/gdb.cp/typeid.exp b/gdb/testsuite/gdb.cp/typeid.exp
index 84c65438fe8c5d282c2574485ea9bb3c1e80ad8e..e3474eced085609704ba65375ec0023be15e3a60 100644 (file)
--- a/gdb/testsuite/gdb.cp/typeid.exp
+++ b/gdb/testsuite/gdb.cp/typeid.exp
@@ -1,4 +1,4 @@
-# Copyright 2013-2016 Free Software Foundation, Inc.
+# Copyright 2013-2019 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 {[skip_cplus_tests]} {
     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
 }
 
@@ -27,7 +27,7 @@ proc do_typeid_tests {started} {
     global hex
 
     # We might see the standard type or gdb's internal type.
-    set type_re "(std::type_info|struct gdb_gnu_v3_type_info)"
+    set type_re "(std::type_info|gdb_gnu_v3_type_info)"
 
 
     foreach simple_var {i cp ccp ca b} {