diff options
| author | Tom Tromey <tom@tromey.com> | 2017-05-18 17:31:41 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-05-18 17:40:29 -0600 |
| commit | ec8df23454873916c6b6b918967af631b268acd8 (patch) | |
| tree | 7f4d8f362e9000b101fbdfb8ee881078f9a223c0 | |
| parent | 3e3e7faebe89bfab0d245040b19fd7347d186065 (diff) | |
| download | fsf-binutils-gdb-ec8df23454873916c6b6b918967af631b268acd8.zip fsf-binutils-gdb-ec8df23454873916c6b6b918967af631b268acd8.tar.gz fsf-binutils-gdb-ec8df23454873916c6b6b918967af631b268acd8.tar.bz2 | |
Fix test failure with Rust 1.18 and 1.19
With Rust 1.18 and 1.19, I saw some test suite failures. They were
all of the same form -- Box seems to be qualified in the output now,
like:
print box_some
$64 = core::option::Option<alloc::boxed::Box<u8>>::Some(0x7ffff6c21018 "\001\000")
... where the test was expecting Option<Box<u8>>.
This patch fixes the problem in a way that should work with earlier
versions of Rust.
gdb/testsuite/ChangeLog
2017-05-18 Tom Tromey <tom@tromey.com>
* gdb.rust/simple.exp: Allow Box to be qualified.
| -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\\}" |