From dfcb77a8d78462af49ebc42b41d6fc504f4c2cf0 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 27 Nov 2015 14:15:49 +0000 Subject: [PATCH] Use multi_line to make pattern more human readable gdb/testsuite: 2015-11-27 Yao Qi * gdb.cp/annota2.exp: Rewrite the pattern using multi_line. --- gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.cp/annota2.exp | 98 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bff404d..844d210 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2015-11-27 Yao Qi + * gdb.cp/annota2.exp: Rewrite the pattern using multi_line. + +2015-11-27 Yao Qi + * gdb.cp/annota2.exp: Allow multiple occurrences of the frames-invalid annotation. diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index ed3fd1b..52ef3c4 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -89,8 +89,36 @@ gdb_test_multiple "run" "run until main breakpoint" { # annotate-field-value # annotate-field-end # + +set pat [multi_line "" \ + "\032\032post-prompt" \ + "" \ + "\032\032value-history-begin 1 -" \ + ".*= " \ + "\032\032value-history-value" \ + "\\{" \ + "\032\032field-begin -" \ + "x" \ + "\032\032field-name-end" \ + " = " \ + "\032\032field-value" \ + "1" \ + "\032\032field-end" \ + ", " \ + "\032\032field-begin -" \ + "y" \ + "\032\032field-name-end" \ + " = " \ + "\032\032field-value" \ + "2" \ + "\032\032field-end" \ + "\\}" \ + "" \ + "\032\032value-history-end" \ + $gdb_prompt$] + gdb_test_multiple "print a" "print class" { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n\\{\r\n\032\032field-begin -\r\nx\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n1\r\n\032\032field-end\r\n, \r\n\032\032field-begin -\r\ny\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n2\r\n\032\032field-end\r\n\\}\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" { + -re "$pat" { pass "print class" } } @@ -101,8 +129,21 @@ gdb_test_multiple "print a" "print class" { # annotate-exited # `a.x is 1' is asynchronous regarding to `frames-invalid'. # + +set pat [multi_line "" \ + "\032\032post-prompt" \ + "Continuing." \ + "" \ + "\032\032starting" \ + "\(${frames_invalid}\)*a.x is 1" \ + "\(${frames_invalid}\)*"\ + "\032\032exited 0" \ + "$inferior_exited_re normally." \ + "" \ + "\032\032stopped" \ + $gdb_prompt$] gdb_test_multiple "continue" "continue until exit" { - -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\(${frames_invalid}\)*a.x is 1\r\n\(${frames_invalid}\)*\r\n\032\032exited 0\r\n$inferior_exited_re normally.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { + -re "$pat" { pass "continue until exit" } } @@ -127,8 +168,14 @@ gdb_expect { # # break at first line of main. # +set pat [multi_line "" \ + "\032\032post-prompt" \ + "Breakpoint.*at $hex: file.*$srcfile, line.*" \ + "\032\032breakpoints-invalid.*" \ + $gdb_prompt$] + gdb_test_multiple "break 22" "break at main" { - -re "\r\n\032\032post-prompt\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n\032\032breakpoints-invalid.*\r\n$gdb_prompt$" { + -re "$pat" { pass "breakpoint at main" } } @@ -151,8 +198,14 @@ gdb_test_multiple "run" "run until main breakpoint" { # # set up a watch point on a.x # +set pat [multi_line "" \ + "\032\032post-prompt" \ + ".*atchpoint 3: a.x" \ + "" \ + "\032\032breakpoints-invalid" \ + $gdb_prompt$] gdb_test_multiple "watch a.x" "set watch on a.x" { - -re "\r\n\032\032post-prompt\r\n.*atchpoint 3: a.x.*\r\n\032\032breakpoints-invalid\r\n.*$gdb_prompt$" { + -re "$pat" { pass "set watch on a.x" } } @@ -161,8 +214,43 @@ gdb_test_multiple "watch a.x" "set watch on a.x" { # do a next, so that the watchpoint triggers. This will test: # annotate-watchpoint # +set pat [multi_line "" \ + "\032\032post-prompt" \ + "" \ + "\032\032starting" \ + "\(${frames_invalid}\)*${breakpoints_invalid}" \ + "\032\032watchpoint 3" \ + ".*atchpoint 3: a.x" \ + "" \ + "Old value = 0" \ + "New value = 1" \ + "" \ + "\032\032frame-begin 0 $hex" \ + "" \ + "\032\032frame-function-name" \ + "main" \ + "\032\032frame-args" \ + " \\(\\)" \ + "\032\032frame-source-begin" \ + " at " \ + "\032\032frame-source-file" \ + ".*$srcfile" \ + "\032\032frame-source-file-end" \ + ":" \ + "\032\032frame-source-line" \ + "$decimal" \ + "\032\032frame-source-end" \ + "" \ + "" \ + "\032\032source .*$srcfile.*beg:$hex" \ + "" \ + "\032\032frame-end" \ + "" \ + "\032\032stopped" \ + $gdb_prompt$] + gdb_test_multiple "next" "watch triggered on a.x" { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(${frames_invalid}\)*${breakpoints_invalid}\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { + -re "$pat" { pass "watch triggered on a.x" } } -- 2.7.4