@@ -15933,3 +15933,8 @@ For older changes see ChangeLog-1993-2013.
Copyright 2014-2019 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
+2019-05-04 Philippe Waroquiers <philippe.waroquiers@skynet.be>
+
+ * gdb.base/frame-args.exp: Test new 'frame-arguments presence'.
+ Test new 'set print frame-info'.
+ * gdb.python/py-framefilter.exp: Likewise.
@@ -50,4 +50,60 @@ gdb_test "frame 1" \
".*in call_me \\(i=\\.\\.\\., f=\\.\\.\\., s=\\.\\.\\., ss=\\.\\.\\., u=\\.\\.\\., e=\\.\\.\\.\\) at .*frame-args\\.c:.*" \
"frame 1 with print frame-arguments set to none"
+# Test with "print frame-arguments" set to "presence"
+
+gdb_test_no_output "set print frame-arguments presence" \
+ "set print frame-arguments presence"
+gdb_test "frame 1" \
+ ".*in call_me \\(\\.\\.\\.\\) at .*frame-args\\.c:.*" \
+ "frame 1 with print frame-arguments set to presence"
+gdb_test "frame 2" \
+ ".*in main \\(\\) at .*frame-args\\.c:.*" \
+ "frame 2 (no args) with print frame-arguments set to presence"
+
+
+# Test with "print frame-info" set to "location-and-address"
+gdb_test_no_output "set print frame-info location-and-address" \
+ "set print frame-info location-and-address"
+gdb_test "frame 1" \
+ ".*0x.* in call_me \\(\\.\\.\\.\\) at .*frame-args\\.c:.*" \
+ "frame 1 with print frame-info set to location-and-address"
+
+# Test with "print address" set to "off" ...
+gdb_test_no_output "set print address off" \
+ "set print address off"
+
+# ... and "location-and-address" (previously set)
+gdb_test "frame 1" \
+ "#1 call_me \\(\\.\\.\\.\\) at .*frame-args\\.c:.*" \
+ "frame 1 with print frame-info set to location-and-address and address off"
+
+# ... and "location"
+gdb_test_no_output "set print frame-info location" \
+ "set print frame-info location"
+gdb_test "frame 1" \
+ "#1 call_me \\(\\.\\.\\.\\) at .*frame-args\\.c:.*" \
+ "frame 1 with print frame-info set to location and address off"
+
+# ... and "short-location"
+gdb_test_no_output "set print frame-info short-location" \
+ "set print frame-info short-location"
+gdb_test "frame 1" \
+ "#1 call_me \\(\\.\\.\\.\\)" \
+ "frame 1 with print frame-info set to short-location and address off"
+
+# ... and "source-and-location"
+gdb_test_no_output "set print frame-info source-and-location" \
+ "set print frame-info source-and-location"
+gdb_test "frame 1" \
+ "#1 call_me \\(\\.\\.\\.\\) at .*frame-args\\.c:.*\r\n\[1-9\]\[0-9\]*\[ \t\]*break_me \\(\\);" \
+ "frame 1 with print frame-info set to source-and-location and address off"
+
+# ... and "source-line".
+gdb_test_no_output "set print frame-info source-line" \
+ "set print frame-info source-line"
+gdb_test "frame 1" \
+ "\[1-9\]\[0-9\]*\[ \t\]*break_me \\(\\);" \
+ "frame 1 with print frame-info set to source-line and address off"
+
@@ -161,6 +161,10 @@ gdb_test "bt full hide" \
".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\)\[^#\]*#24.*in func3 \\(i=3\\).*" \
"bt full hide with Reverse disabled"
+# Re-enable Reverse
+gdb_test_no_output "enable frame-filter global Reverse" \
+ "re-enable frame-filter global Reverse"
+
# Test set print frame-arguments
# none
gdb_test_no_output "set print frame-arguments none" \
@@ -169,7 +173,7 @@ gdb_test "bt no-filter 1" \
"#0.*end_func \\(foo=\.\.\., bar=\.\.\., fb=\.\.\., bf=\.\.\.\\) at .*py-framefilter.c.*" \
"bt no-filter 1 no args"
gdb_test "bt 1" \
- "#0.*end_func \\(foo=\.\.\., bar=\.\.\., fb=\.\.\., bf=\.\.\.\\) at .*py-framefilter.c.*" \
+ "#0.*cnuf_dneThe End \\(foo=\.\.\., bar=\.\.\., fb=\.\.\., bf=\.\.\.\\) at .*py-framefilter.c.*" \
"bt 1 no args"
# scalars
@@ -179,9 +183,54 @@ gdb_test "bt no-filter 1" \
"#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\.\.\.\\) at .*py-framefilter.c.*" \
"bt no-filter 1 scalars"
gdb_test "bt 1" \
- "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\.\.\.\\) at .*py-framefilter.c.*" \
+ "#0.*cnuf_dneThe End \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\.\.\.\\) at .*py-framefilter.c.*" \
"bt 1 scalars"
+# presence
+gdb_test_no_output "set print frame-arguments presence" \
+ "turn frame arguments to presence only"
+gdb_test "bt no-filter 1" \
+ "#0.*end_func \\(\.\.\.\\) at .*py-framefilter.c.*" \
+ "bt no-filter 1 presence"
+gdb_test "bt 1" \
+ "#0.*cnuf_dneThe End \\(\.\.\.\\) at .*py-framefilter.c.*" \
+ "bt 1 presence"
+
+# Test set print frame-info, with only presence for args.
+# short-location
+gdb_test_no_output "set print frame-info short-location" \
+ "frame-info short-location"
+gdb_test "bt no-filter 1" \
+ "#0.*end_func \\(\.\.\.\\)\r\n.*" \
+ "bt no-filter 1 short-location"
+gdb_test "bt 1" \
+ "#0.*cnuf_dneThe End \\(\.\.\.\\)\r\n.*" \
+ "bt 1 short-location"
+
+# source-and-location
+gdb_test_no_output "set print frame-info source-and-location" \
+ "frame-info source-and-location"
+gdb_test "bt no-filter 1" \
+ "#0.*end_func \\(\.\.\.\\) at .*py-framefilter.c.*\r\n.*\[1-9\]\[0-9\]*.*" \
+ "bt no-filter 1 source-and-location"
+gdb_test "bt 1" \
+ "#0.*cnuf_dneThe End \\(\.\.\.\\) at .*py-framefilter.c.*\r\n.*\[1-9\]\[0-9\]*.*" \
+ "bt 1 source-and-location"
+
+# source-line
+gdb_test_no_output "set print frame-info source-line" \
+ "frame-info source-line"
+gdb_test "bt no-filter 1" \
+ "\[1-9\]\[0-9\]*\[ \t\]*return; /\\* Backtrace end breakpoint \\*/.*" \
+ "bt no-filter 1 source-line"
+gdb_test "bt 1" \
+ "\[1-9\]\[0-9\]*\[ \t\]*return; /\\* Backtrace end breakpoint \\*/.*" \
+ "bt 1 source-line"
+
+# set print frame-info back to auto.
+gdb_test_no_output "set print frame-info auto" \
+ "frame-info auto"
+
# all
gdb_test_no_output "set print frame-arguments all" \
"turn on frame arguments"
@@ -189,7 +238,7 @@ gdb_test "bt no-filter 1" \
"#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\{nothing = $hex \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
"bt no-filter 1 all args"
gdb_test "bt 1" \
- "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\{nothing = $hex \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
+ "#0.*cnuf_dneThe End \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\{nothing = $hex \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
"bt 1 all args"
# set print address off
@@ -199,7 +248,7 @@ gdb_test "bt no-filter 1" \
"#0 end_func \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
"bt no-filter 1 no address"
gdb_test "bt 1" \
- "#0 end_func \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
+ "#0 cnuf_dneThe End \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \
"bt 1 no addresss"
gdb_test_no_output "set python print-stack message" \