Show optimized out local variables in "info locals"

[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 13f229fdd0a810ea19213f2505aed20f142e29e3..7245df79adbc7c74470bded94f0bce03b7f36b42 100644 (file)
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Free Software Foundation, Inc.
+# Copyright 2008-2017 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
@@ -15,8 +15,8 @@
 
 standard_testfile .c inline-markers.c
 
-if {[prepare_for_testing $testfile.exp $testfile \
-        [list $srcfile $srcfile2] {debug optimize=-O2}]} {
+if {[prepare_for_testing "failed to prepare" $testfile \
+        [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} {
     return -1
 }
 
@@ -34,18 +34,19 @@ set no_frames [skip_inline_frame_tests]
 set line1 [gdb_get_line_number "set breakpoint 1 here" ${srcfile2}]
 gdb_breakpoint $srcfile2:$line1
 
-gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)"
+gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 1"
 
-gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)"
+gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 2"
 
 if { ! $no_frames } {
     gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*main.*" \
-       "backtrace from bar (2)"
-    gdb_test "up" "#1  .*func1 .* at .*" "up from bar (2)"
-    gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)"
-    gdb_test "info locals" "array = {.*}" "info locals above bar (2)"
+       "backtrace from bar 2"
+    gdb_test "up" "#1  .*func1 .* at .*" "up from bar 2"
+    gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 2"
+    setup_kfail "gdb/xyz" *-*-*
+    gdb_test "info locals" "array = {.*}" "info locals above bar 2"
 
-    set msg "info args above bar (2)"
+    set msg "info args above bar 2"
     gdb_test_multiple "info args" $msg {
        -re "arg1 = $decimal\r\n$gdb_prompt $" {
            pass $msg
@@ -59,13 +60,13 @@ if { ! $no_frames } {
        }
     }
 } else {
-    gdb_test "up" "#1  .*main .* at .*" "up from bar (2)"
-    gdb_test "info locals" ".*arg1 = 0.*" "info locals above bar (2)"
+    gdb_test "up" "#1  .*main .* at .*" "up from bar 2"
+    gdb_test "info locals" ".*arg1 = 0.*" "info locals above bar 2"
 }
 
 # Make sure that locals on the stack are found.  This is an array to
 # prevent it from living in a register.
-gdb_test "print array\[0\]" "\\\$$decimal = 0" "print local (2)"
+gdb_test "print array\[0\]" "\\\$$decimal = 0" "print local 2"
 
 if { ! $no_frames } {
     # Verify that we do not print out variables from the inlined
@@ -76,15 +77,16 @@ if { ! $no_frames } {
 
 # Repeat the tests from a depth of two inlined functions, and with a
 # more interesting value in the local array.
-gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)"
+gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 3"
 if { ! $no_frames } {
     gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*func2.*#3  .*main.*" \
-       "backtrace from bar (3)"
-    gdb_test "up" "#1  .*func1 .* at .*" "up from bar (3)"
-    gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)"
-    gdb_test "info locals" "array = {.*}" "info locals above bar (3)"
+       "backtrace from bar 3"
+    gdb_test "up" "#1  .*func1 .* at .*" "up from bar 3"
+    gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 3"
+    setup_kfail "gdb/xyz" *-*-*
+    gdb_test "info locals" "array = {.*}" "info locals above bar 3"
 
-    set msg "info args above bar (3)"
+    set msg "info args above bar 3"
     gdb_test_multiple "info args" $msg {
        -re "arg1 = $decimal\r\n$gdb_prompt $" {
            pass $msg
@@ -98,9 +100,9 @@ if { ! $no_frames } {
        }
     }
 } else {
-    gdb_test "up" "#1  .*main .* at .*" "up from bar (3)"
+    gdb_test "up" "#1  .*main .* at .*" "up from bar 3"
     gdb_test "info locals" ".*arg1 = 1.*" "info locals above bar (3a)"
     gdb_test "info locals" ".*arg2 = 184.*" "info locals above bar (3b)"
 }
 
-gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
+gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local 3"