gdb/testsuite: make test names unique in gdb.python/py-format-string.exp

Make use of `proc_with_prefix` for every test_* proc in order to make
the test names unique within this test file.

gdb/testsuite/ChangeLog:

	* gdb.python/py-format-string.exp: Use proc_with_prefix to make
	test names unique.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dea3ce555050b6a2211091f9d1389897f1500bd9..0125f35d64d28b5deca7ac89bbb638affb6764db 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.python/py-format-string.exp: Use proc_with_prefix to make
+       test names unique.
+
 2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * gdb.python/py-mi.exp: Use with_test_prefix to make test names

diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp
index 160e9019cda0b0972bd5a278d4d9e33201f7a376..ed82ee29fc65a2639a9d11f2846ed2e8333131ee 100644 (file)
--- a/gdb/testsuite/gdb.python/py-format-string.exp
+++ b/gdb/testsuite/gdb.python/py-format-string.exp
@@ -228,7 +228,7 @@ proc check_var_with_bool_opt {
 }
 
 # Test gdb.Value.format_string with no options.
-proc test_no_opts {} {
+proc_with_prefix test_no_opts {} {
   global current_lang
 
   check_var_with_no_opts "a_point_t"
@@ -253,7 +253,7 @@ proc test_no_opts {} {
 }
 
 # Test the raw option for gdb.Value.format_string.
-proc test_raw {} {
+proc_with_prefix test_raw {} {
   global current_lang
   global default_ref_regexp
 
@@ -290,7 +290,7 @@ proc test_raw {} {
 }
 
 # Test the pretty_arrays option for gdb.Value.format_string.
-proc test_pretty_arrays {} {
+proc_with_prefix test_pretty_arrays {} {
   global current_lang
 
   set an_array_pretty "\\{\[\r\n\]+  2,\[\r\n\]+  3,\[\r\n\]+  5\[\r\n\]+\\}"
@@ -331,7 +331,7 @@ proc test_pretty_arrays {} {
 }
 
 # Test the pretty_structs option for gdb.Value.format_string.
-proc test_pretty_structs {} {
+proc_with_prefix test_pretty_structs {} {
   global current_lang
 
   set a_struct_with_union_pretty \
@@ -376,7 +376,7 @@ proc test_pretty_structs {} {
 }
 
 # Test the array_indexes option for gdb.Value.format_string.
-proc test_array_indexes {} {
+proc_with_prefix test_array_indexes {} {
   global current_lang
 
   set an_array_with_indexes "\\{\\\[0\\\] = 2, \\\[1\\\] = 3, \\\[2\\\] = 5\\}"
@@ -419,7 +419,7 @@ proc test_array_indexes {} {
 }
 
 # Test the symbols option for gdb.Value.format_string.
-proc test_symbols {} {
+proc_with_prefix test_symbols {} {
   global undefined
   global current_lang
   global default_pointer_regexp
@@ -454,7 +454,7 @@ proc test_symbols {} {
 }
 
 # Test the unions option for gdb.Value.format_string.
-proc test_unions {} {
+proc_with_prefix test_unions {} {
   global undefined
   global current_lang
 
@@ -488,7 +488,7 @@ proc test_unions {} {
 }
 
 # Test the address option for gdb.Value.format_string.
-proc test_address {} {
+proc_with_prefix test_address {} {
   global undefined
   global current_lang
 
@@ -530,7 +530,7 @@ proc test_address {} {
 }
 
 # Test the deref_refs option for gdb.Value.format_string.
-proc test_deref_refs {} {
+proc_with_prefix test_deref_refs {} {
   global current_lang
   global default_pointer_regexp
   global default_ref_regexp
@@ -557,7 +557,7 @@ proc test_deref_refs {} {
 }
 
 # Test the actual_objects option for gdb.Value.format_string.
-proc test_actual_objects {} {
+proc_with_prefix test_actual_objects {} {
   global current_lang
 
   check_var_with_bool_opt "actual_objects" "a_point_t"
@@ -590,7 +590,7 @@ proc test_actual_objects {} {
 }
 
 # Test the static_members option for gdb.Value.format_string.
-proc test_static_members {} {
+proc_with_prefix test_static_members {} {
   global current_lang
 
   check_var_with_bool_opt "static_members" "a_point_t"
@@ -625,7 +625,7 @@ proc test_static_members {} {
 }
 
 # Test the max_elements option for gdb.Value.format_string.
-proc test_max_elements {} {
+proc_with_prefix test_max_elements {} {
   global current_lang
   global default_pointer_regexp
 
@@ -718,7 +718,7 @@ proc test_max_elements {} {
 }
 
 # Test the max_depth option for gdb.Value.format_string.
-proc test_max_depth {} {
+proc_with_prefix test_max_depth {} {
     set opts "max_depth=-1"
     with_test_prefix $opts {
        check_format_string "a_struct_with_union" $opts
@@ -738,7 +738,7 @@ proc test_max_depth {} {
 }
 
 # Test the repeat_threshold option for gdb.Value.format_string.
-proc test_repeat_threshold {} {
+proc_with_prefix test_repeat_threshold {} {
   global current_lang
   global default_pointer_regexp
 
@@ -844,7 +844,7 @@ proc test_repeat_threshold {} {
 }
 
 # Test the format option for gdb.Value.format_string.
-proc test_format {} {
+proc_with_prefix test_format {} {
   global current_lang
   global default_pointer_regexp
 
@@ -920,7 +920,7 @@ proc test_format {} {
 }
 
 # Test mixing options.
-proc test_mixed {} {
+proc_with_prefix test_mixed {} {
   global current_lang
   global default_ref_regexp
   global default_pointer_regexp
@@ -954,7 +954,7 @@ proc test_mixed {} {
 }
 
 # Test passing invalid arguments to gdb.Value.format_string.
-proc test_invalid_args {} {
+proc_with_prefix test_invalid_args {} {
   check_format_string \
     "a_point_t" \
     "12" \
@@ -977,7 +977,7 @@ proc test_invalid_args {} {
 }
 
 # Run all the tests in common for both C and C++.
-proc test_all_common {} {
+proc_with_prefix test_all_common {} {
   # No options.
   test_no_opts
   # Single options set to True/False.