From 158da0d12a7c9bb01c6d9b8d3da609a1e2561916 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 25 Oct 2019 10:48:12 +0200 Subject: [gdb/testsuite] Use -wrap and $gdb_test_name in gdb_test_multiple calls (2) Make gdb_test_multiple calls shorter by using new gdb_test_multiple variable $gdb_test_name and new gdb_test_multiple pattern flag -wrap. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2019-10-25 Tom de Vries * gdb.reverse/sigall-precsave.exp: Use -wrap and $gdb_test_name in gdb_test_multiple calls. * gdb.reverse/sigall-reverse.exp: Same. * gdb.reverse/solib-precsave.exp: Same. * gdb.reverse/solib-reverse.exp: Same. * gdb.reverse/until-precsave.exp: Same. * gdb.reverse/until-reverse.exp: Same. Change-Id: I67bb327d069dbc439410996bcfe6c7f905b2ca52 --- gdb/testsuite/gdb.reverse/solib-reverse.exp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gdb/testsuite/gdb.reverse/solib-reverse.exp') diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp index 53b35239f81..6d4a8a1c0c3 100644 --- a/gdb/testsuite/gdb.reverse/solib-reverse.exp +++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp @@ -86,15 +86,12 @@ if [supports_process_record] { set end_part_one [gdb_get_line_number " end part one" "$srcfile"] set end_part_two [gdb_get_line_number " end part two" "$srcfile"] -set test "run until end part one" -set pass_pattern " end part one.*" -set kfail_pattern "Process record does not support instruction 0xfae64 at.*" -gdb_test_multiple "until $end_part_one" $test { - -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { - pass $test +gdb_test_multiple "until $end_part_one" "run until end part one" { + -wrap -re " end part one.*" { + pass $gdb_test_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { - kfail "gdb/25038" $test + -wrap -re "Process record does not support instruction 0xfae64 at.*" { + kfail "gdb/25038" $gdb_test_name return -1 } } -- cgit v1.2.1