Fix more cases of improper test names

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

diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp
index 11f16d5b63929dbd45464c7be21bcdf222b4080d..00332ce3954b39250e109bdd35615cd47d74c72b 100644 (file)
--- a/gdb/testsuite/gdb.cp/gdb1355.exp
+++ b/gdb/testsuite/gdb.cp/gdb1355.exp
@@ -1,18 +1,17 @@
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003-2016 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Tests for PR gdb/1355, which is a reference to PR gcc/12066.
 # 2003-08-26  Michael Chastain <mec@shout.net>
@@ -22,35 +21,22 @@
 set ws "\[\r\n\t \]*"
 set nl "\[\r\n\]+"
 
-if $tracelevel then {
-    strace $tracelevel
-    }
-
 if { [skip_cplus_tests] } { continue }
 
 #
 # test running programs
 #
-set prms_id 0
-set bug_id 0
 
-set testfile "gdb1355"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+if [get_compiler_info "c++"] {
+    return -1
 }
 
-if [get_compiler_info ${binfile} "c++"] {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![runto_main] then {
     perror "couldn't run to main"
     continue
@@ -68,11 +54,11 @@ set s_tail  ".*"
 
 set f_i     "${ws}int m_int;"
 set f_c     "${ws}char m_char;"
-set f_li    "${ws}long int m_long_int;"
+set f_li    "${ws}long( int)? m_long_int;"
 set f_ui    "${ws}unsigned int m_unsigned_int;"
-set f_lui   "${ws}long unsigned int m_long_unsigned_int;"
-set f_si    "${ws}short int m_short_int;"
-set f_sui   "${ws}short unsigned int m_short_unsigned_int;"
+set f_lui   "${ws}(long unsigned int|unsigned long) m_long_unsigned_int;"
+set f_si    "${ws}short( int)? m_short_int;"
+set f_sui   "${ws}(short unsigned int|unsigned short) m_short_unsigned_int;"
 set f_uc    "${ws}unsigned char m_unsigned_char;"
 set f_f     "${ws}float m_float;"
 set f_d     "${ws}double m_double;"
@@ -80,7 +66,7 @@ set f_ld    "${ws}long double m_long_double;"
 set f_b     "${ws}bool m_bool;"
 
 set itc     "<invalid type code ${decimal}>"
-set bad_i   "${ws}(${itc}|int) m_int;";
+set bad_i   "${ws}(${itc}|int) m_int;"
 set bad_c   "${ws}(${itc}|char) m_char;"
 set bad_li  "${ws}(${itc}|long int) m_long_int;"
 set bad_ui  "${ws}(${itc}|unsigned int) m_unsigned_int;"