From d5cf82c0d7a7b13727a2f26425afc9051656a716 Mon Sep 17 00:00:00 2001 From: Hannes Domani Date: Thu, 30 Apr 2020 13:17:30 +0200 Subject: [PATCH] Adjust array pretty printer tests to the new format gdb/testsuite/ChangeLog: 2020-04-30 Hannes Domani * gdb.python/py-format-string.exp: Adjust pretty_arrays expected output to the new format. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.python/py-format-string.exp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f1efecb5f5e..6b25cd8a51b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-30 Hannes Domani + + * gdb.python/py-format-string.exp: Adjust pretty_arrays expected + output to the new format. + 2020-04-29 Simon Marchi * gdb.base/break.exp: Use with_test_prefix. diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp index faafc81c6b0..f809ef30cb3 100644 --- a/gdb/testsuite/gdb.python/py-format-string.exp +++ b/gdb/testsuite/gdb.python/py-format-string.exp @@ -291,9 +291,9 @@ proc test_raw {} { proc test_pretty_arrays {} { global current_lang - set an_array_pretty " \\{2,\[\r\n\]+ 3,\[\r\n\]+ 5\\}" + set an_array_pretty "\\{\[\r\n\]+ 2,\[\r\n\]+ 3,\[\r\n\]+ 5\[\r\n\]+\\}" set an_array_with_repetition_pretty \ - " \\{1,\[\r\n\]+ 3 ,\[\r\n\]+ 5,\[\r\n\]+ 5,\[\r\n\]+ 5\\}" + "\\{\[\r\n\]+ 1,\[\r\n\]+ 3 ,\[\r\n\]+ 5,\[\r\n\]+ 5,\[\r\n\]+ 5\[\r\n\]+\\}" check_var_with_bool_opt "pretty_arrays" "a_point_t" check_var_with_bool_opt "pretty_arrays" "a_point_t_pointer" @@ -886,7 +886,7 @@ proc test_mixed {} { check_format_string "an_array" \ "array_indexes=True, pretty_arrays=True" \ - " \\{\\\[0\\\] = 2,\[\r\n\]+ \\\[1\\\] = 3,\[\r\n\]+ \\\[2\\\] = 5\\}" + "\\{\[\r\n\]+ \\\[0\\\] = 2,\[\r\n\]+ \\\[1\\\] = 3,\[\r\n\]+ \\\[2\\\] = 5\[\r\n\]+\\}" check_format_string "a_struct_with_union" \ "pretty_structs=True, unions=False" \ -- 2.30.2