From 855c84ea47c0b4f873af31f7cf10b6eefff3f6c2 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Tue, 10 Mar 2015 09:51:27 +0100 Subject: [PATCH] Share the "multi_line" helper among all Ada testcases gdb/testsuite/ChangeLog: 2015-03-10 Pierre-Marie de Rodat * gdb.ada/complete.exp: Remove "multi_line". * gdb.ada/info_exc.exp: Remove "multi_line". * gdb.ada/packed_tagged.exp: Remove "multi_line". * gdb.ada/ptype_field.exp: Remove "multi_line". * gdb.ada/sym_print_name.exp: Remove "multi_line". * gdb.ada/tagged.exp: Remove "multi_line". * lib/ada.exp: Add the "multi_line" helper. --- gdb/testsuite/gdb.ada/complete.exp | 10 ---------- gdb/testsuite/gdb.ada/info_exc.exp | 11 ----------- gdb/testsuite/gdb.ada/packed_tagged.exp | 11 ----------- gdb/testsuite/gdb.ada/ptype_field.exp | 11 ----------- gdb/testsuite/gdb.ada/sym_print_name.exp | 11 ----------- gdb/testsuite/gdb.ada/tagged.exp | 11 ----------- gdb/testsuite/lib/ada.exp | 11 +++++++++++ 7 files changed, 11 insertions(+), 65 deletions(-) diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp index 1dc9cba..9919bdf 100644 --- a/gdb/testsuite/gdb.ada/complete.exp +++ b/gdb/testsuite/gdb.ada/complete.exp @@ -44,16 +44,6 @@ proc test_gdb_no_completion { expr } { gdb_test_no_output "complete p $expr" } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} # Try a global variable, only one match should be found: test_gdb_complete "my_glob" \ diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp index 3f21218..add83c5 100644 --- a/gdb/testsuite/gdb.ada/info_exc.exp +++ b/gdb/testsuite/gdb.ada/info_exc.exp @@ -21,17 +21,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } return -1 } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} - clean_restart ${testfile} if ![runto_main] then { diff --git a/gdb/testsuite/gdb.ada/packed_tagged.exp b/gdb/testsuite/gdb.ada/packed_tagged.exp index 02e02ea..4187702 100644 --- a/gdb/testsuite/gdb.ada/packed_tagged.exp +++ b/gdb/testsuite/gdb.ada/packed_tagged.exp @@ -21,17 +21,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } return -1 } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} - clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/comp_bug.adb] diff --git a/gdb/testsuite/gdb.ada/ptype_field.exp b/gdb/testsuite/gdb.ada/ptype_field.exp index caf99ba..b4eb8f6 100644 --- a/gdb/testsuite/gdb.ada/ptype_field.exp +++ b/gdb/testsuite/gdb.ada/ptype_field.exp @@ -21,17 +21,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional return -1 } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} - clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] diff --git a/gdb/testsuite/gdb.ada/sym_print_name.exp b/gdb/testsuite/gdb.ada/sym_print_name.exp index c78793e..f942fdf 100644 --- a/gdb/testsuite/gdb.ada/sym_print_name.exp +++ b/gdb/testsuite/gdb.ada/sym_print_name.exp @@ -21,17 +21,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } return -1 } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} - clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp index 9f40a96..f428148 100644 --- a/gdb/testsuite/gdb.ada/tagged.exp +++ b/gdb/testsuite/gdb.ada/tagged.exp @@ -21,17 +21,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } return -1 } -# A convenience function that joins all the arguments together, -# with a regexp that matches zero-or-more end of lines in between -# each argument. This function is ideal to write the expected output -# of a GDB command that generates more than a couple of lines, as -# this allows us to write each line as a separate string, which is -# easier to read by a human being. - -proc multi_line { args } { - return [join $args "\[\r\n\]*"] -} - clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 6a1e192..903ef45 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -60,3 +60,14 @@ proc standard_ada_testfile {base_file {dir ""}} { file mkdir [standard_output_file $testdir] } + +# A convenience function that joins all the arguments together, +# with a regexp that matches zero-or-more end of lines in between +# each argument. This function is ideal to write the expected output +# of a GDB command that generates more than a couple of lines, as +# this allows us to write each line as a separate string, which is +# easier to read by a human being. + +proc multi_line { args } { + return [join $args "\[\r\n\]*"] +} -- 2.3.1