Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.opt / inline-locals.exp

diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index f1f58cb7b39b95494303493f7943843415ab9fa3..2723ff9b5c700bf0bacebcc667b6aa1fe784df32 100644 (file)
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -1,4 +1,4 @@
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008-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
@@ -13,28 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "inline-locals"
-set srcfile ${testfile}.c
-set srcfile2 "inline-markers.c"
-set fullsrcfile "${srcdir}/${subdir}/${srcfile}"
-set fullsrcfile2 "${srcdir}/${subdir}/${srcfile2}"
-set sources [list ${fullsrcfile} ${fullsrcfile2}]
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile ${sources} ${binfile} \
-          executable {debug optimize=-O2}] != "" } {
-    untested inline-locals.exp
+standard_testfile .c inline-markers.c
+
+if {[prepare_for_testing "failed to prepare" $testfile \
+        [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto_main
 
-get_compiler_info $binfile
+get_compiler_info
 get_debug_format
 if { [skip_inline_var_tests] } {
     untested inline-bt.exp
@@ -62,7 +50,7 @@ if { ! $no_frames } {
        -re "arg1 = $decimal\r\n$gdb_prompt $" {
            pass $msg
        }
-       -re "arg1 = <value optimized out>\r\n$gdb_prompt $" {
+       -re "arg1 = <optimized out>\r\n$gdb_prompt $" {
            # GCC 4.3 and later lose location information for arg1.  GCC 4.2 is OK.
            if { [test_compiler_info "gcc-4-3-*"]  || [test_compiler_info "gcc-4-4-*"]} {
                setup_xfail *-*-*
@@ -101,7 +89,7 @@ if { ! $no_frames } {
        -re "arg1 = $decimal\r\n$gdb_prompt $" {
            pass $msg
        }
-       -re "arg1 = <value optimized out>\r\n$gdb_prompt $" {
+       -re "arg1 = <optimized out>\r\n$gdb_prompt $" {
            # GCC 4.3 and later lose location information for arg1.  GCC 4.2 is OK.
            if { [test_compiler_info "gcc-4-3-*"]  || [test_compiler_info "gcc-4-4-*"]} {
                setup_xfail *-*-*