diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.rust/simple.exp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 40df91e..a3a75bc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-05-18 Tom Tromey <tom@tromey.com> + + * gdb.rust/simple.exp: Allow Box to be qualified. + 2017-05-18 Thomas Preud'homme <thomas.preudhomme@arm.com> * gdb.base/float.exp: Expect GDB prompt for targets without FPU. diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 0bcc83e..872b22c 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -198,8 +198,8 @@ gdb_test "print str_some" \ gdb_test "print str_none" " = core::option::Option<collections::string::String>::None" gdb_test "print int_some" " = core::option::Option::Some\\(1\\)" gdb_test "print int_none" " = core::option::Option::None" -gdb_test "print box_some" " = core::option::Option<Box<u8>>::Some\\(.*\\)" -gdb_test "print box_none" " = core::option::Option<Box<u8>>::None" +gdb_test "print box_some" " = core::option::Option<\[a-z:\]*Box<u8>>::Some\\(.*\\)" +gdb_test "print box_none" " = core::option::Option<\[a-z:\]*Box<u8>>::None" gdb_test "print custom_some" \ " = simple::NonZeroOptimized::Value\\(collections::string::String .*" gdb_test "print custom_none" " = simple::NonZeroOptimized::Empty" @@ -241,8 +241,8 @@ gdb_test "print (1)" " = 1" gdb_test "print 23..97.0" "Range expression with different types" gdb_test "print (*parametrized.next.val)" \ - " = simple::ParametrizedStruct<i32> {next: simple::ParametrizedEnum<Box<simple::ParametrizedStruct<i32>>>::Empty, value: 1}" + " = simple::ParametrizedStruct<i32> {next: simple::ParametrizedEnum<\[a-z:\]*Box<simple::ParametrizedStruct<i32>>>::Empty, value: 1}" gdb_test "print parametrized.next.val" \ " = \\(simple::ParametrizedStruct<i32> \\*\\) $hex" gdb_test "print parametrized" \ - " = simple::ParametrizedStruct<i32> \\{next: simple::ParametrizedEnum<Box<simple::ParametrizedStruct<i32>>>::Val\\{val: $hex\\}, value: 0\\}" + " = simple::ParametrizedStruct<i32> \\{next: simple::ParametrizedEnum<\[a-z:\]*Box<simple::ParametrizedStruct<i32>>>::Val\\{val: $hex\\}, value: 0\\}" |