diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/derivation.exp | 30 |
2 files changed, 21 insertions, 13 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f4b9ade..698f116 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-06-06 Doug Evans <dje@google.com> + + * gdb.cp/derivation.exp: Make tests have unique names. + 2013-06-06 Tom Tromey <tromey@redhat.com> * gdb.base/dump.exp (capture_value): Don't put expression into diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp index 66a3a3b..8521239 100644 --- a/gdb/testsuite/gdb.cp/derivation.exp +++ b/gdb/testsuite/gdb.cp/derivation.exp @@ -40,15 +40,17 @@ if {[prepare_for_testing $testfile.exp $testfile \ } # Check inheritance of typedefs. -foreach klass {"A" "D" "E" "F" "A2" "D2"} { - gdb_test "ptype ${klass}::value_type" "type = int" - gdb_test "whatis ${klass}::value_type" "type = int" - gdb_test "p (${klass}::value_type) 0" " = 0" -} -foreach klass {"Z" "ZZ"} { - gdb_test "ptype ${klass}::value_type" "type = float" - gdb_test "whatis ${klass}::value_type" "type = float" - gdb_test "p (${klass}::value_type) 0" " = 0" +with_test_prefix "before run" { + foreach klass {"A" "D" "E" "F" "A2" "D2"} { + gdb_test "ptype ${klass}::value_type" "type = int" + gdb_test "whatis ${klass}::value_type" "type = int" + gdb_test "p (${klass}::value_type) 0" " = 0" + } + foreach klass {"Z" "ZZ"} { + gdb_test "ptype ${klass}::value_type" "type = float" + gdb_test "whatis ${klass}::value_type" "type = float" + gdb_test "p (${klass}::value_type) 0" " = 0" + } } # Set it up at a breakpoint so we can play with the variable values. @@ -59,10 +61,12 @@ if ![runto 'marker1'] then { } # Check inheritance of typedefs again, but this time with an active block. -foreach klass {"A" "D" "A2" "D2"} { - gdb_test "ptype ${klass}::value_type" "type = int" - gdb_test "whatis ${klass}::value_type" "type = int" - gdb_test "p (${klass}::value_type) 0" " = 0" +with_test_prefix "at marker1" { + foreach klass {"A" "D" "A2" "D2"} { + gdb_test "ptype ${klass}::value_type" "type = int" + gdb_test "whatis ${klass}::value_type" "type = int" + gdb_test "p (${klass}::value_type) 0" " = 0" + } } gdb_test "up" ".*main.*" "up from marker1" |