[PATCH 05/14] gdb/testsuite: make test names unique in gdb.python/py-explore.exp

[Andrew Burgess]

Add a with_test_prefix to make test names unique.

gdb/testsuite/ChangeLog:

	* gdb.python/py-explore.exp: Add with_test_prefix to make test
	names unique.
---
 gdb/testsuite/ChangeLog                 |  5 +++
 gdb/testsuite/gdb.python/py-explore.exp | 58 +++++++++++++------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/gdb/testsuite/gdb.python/py-explore.exp b/gdb/testsuite/gdb.python/py-explore.exp
index 6d27b5a6db8..1772dc0045b 100644
--- a/gdb/testsuite/gdb.python/py-explore.exp
+++ b/gdb/testsuite/gdb.python/py-explore.exp
@@ -446,33 +446,35 @@ gdb_test_multiple "explore type union ComplexUnion" "" {
     }
 }
 
-gdb_test_multiple "explore type cu" "" {
-    -re "'cu' is of type 'union ComplexUnion'.*[compound_type_description $CU {union}].*$CU_fields_types.*" {
-        pass "explore type union ComplexUnion"
-        gdb_test_multiple "0" "explore type union ComplexStruct field 0" {
-            -re ".*[child_compound_type_description $CU_field_0 $SS {struct/class}].*$SS_fields_types.*" {
-                pass "explore type union ComplexUnion field 0"
-                gdb_test_multiple "\0" "return to ComplexUnion from field 0" {
-                    -re ".*[compound_type_description $CU {union}].*$CU_fields_types.*" {
-                        pass "return to ComplexUnion from field 0"
-                    }
-                }
-            }
-        }
-        gdb_test_multiple "1" "explore type union ComplexUnion field 1" {
-            -re ".*[child_array_type_description $CU_field_1 $SS].*" {
-                pass "explore type union ComplexUnion field 1"
-                gdb_test_multiple "\0" "return to ComplexUnion array" {
-                    -re ".*[compound_type_description $CU {union}].*$CU_fields_types.*" {
-                        pass "return to ComplexUnion from field 1"
-                    }
-                }
-            }
-        }
-        gdb_test_multiple "\0" "return to GDB prompt from ComplexUnion type exploration" {
-            -re "$gdb_prompt" {
-                pass "return to GDB prompt from ComplexUnion type exploration"
-            }
-        }
+with_test_prefix "using 'cu'" {
+    gdb_test_multiple "explore type cu" "" {
+	-re "'cu' is of type 'union ComplexUnion'.*[compound_type_description $CU {union}].*$CU_fields_types.*" {
+	    pass "explore type union ComplexUnion"
+	    gdb_test_multiple "0" "explore type union ComplexStruct field 0" {
+		-re ".*[child_compound_type_description $CU_field_0 $SS {struct/class}].*$SS_fields_types.*" {
+		    pass "explore type union ComplexUnion field 0"
+		    gdb_test_multiple "\0" "return to ComplexUnion from field 0" {
+			-re ".*[compound_type_description $CU {union}].*$CU_fields_types.*" {
+			    pass "return to ComplexUnion from field 0"
+			}
+		    }
+		}
+	    }
+	    gdb_test_multiple "1" "explore type union ComplexUnion field 1" {
+		-re ".*[child_array_type_description $CU_field_1 $SS].*" {
+		    pass "explore type union ComplexUnion field 1"
+		    gdb_test_multiple "\0" "return to ComplexUnion array" {
+			-re ".*[compound_type_description $CU {union}].*$CU_fields_types.*" {
+			    pass "return to ComplexUnion from field 1"
+			}
+		    }
+		}
+	    }
+	    gdb_test_multiple "\0" "return to GDB prompt from ComplexUnion type exploration" {
+		-re "$gdb_prompt" {
+		    pass "return to GDB prompt from ComplexUnion type exploration"
+		}
+	    }
+	}
     }
 }
-- 
2.25.4