aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-08-05 15:38:32 -0600
committerTom Tromey <tom@tromey.com>2017-08-05 15:38:32 -0600
commitfdffd6f4118652bdfdff383943f13664af4b9a45 (patch)
treed0a82c343e5609328a7409b2cbf9fcc9dc2b7655 /gdb
parent3232fabd2d0094d74bd942a1f2c5c284b0cd9260 (diff)
downloadgdb-fdffd6f4118652bdfdff383943f13664af4b9a45.zip
gdb-fdffd6f4118652bdfdff383943f13664af4b9a45.tar.gz
gdb-fdffd6f4118652bdfdff383943f13664af4b9a45.tar.bz2
Fix Rust test suite for 1.20 beta
I ran the gdb.rust tests against Rust 1.20 (beta) and saw a few failures. The failures all came because a particular item moved to a different module. Since the particular choice of module name isn't important here, I simply widened the allowable results. Tested locally against rustc 1.19, 1.20, and 1.21. testsuite/ChangeLog 2017-08-05 Tom Tromey <tom@tromey.com> * gdb.rust/simple.exp: Allow String to appear in a different namespace.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.rust/simple.exp6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2a777a8..31f419f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-05 Tom Tromey <tom@tromey.com>
+
+ * gdb.rust/simple.exp: Allow String to appear in a different
+ namespace.
+
2017-07-26 Yao Qi <yao.qi@linaro.org>
* gdb.gdb/unittest.exp: Invoke command
diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp
index 83dab17..403a11b 100644
--- a/gdb/testsuite/gdb.rust/simple.exp
+++ b/gdb/testsuite/gdb.rust/simple.exp
@@ -197,14 +197,14 @@ gdb_test "print 5.." " = .*::ops::RangeFrom.* \\{start: 5\\}"
gdb_test "print .." " = .*::ops::RangeFull"
gdb_test "print str_some" \
- " = core::option::Option<collections::string::String>::Some\\(collections::string::String .*"
-gdb_test "print str_none" " = core::option::Option<collections::string::String>::None"
+ " = core::option::Option<\[a-z\]+::string::String>::Some\\(\[a-z\]+::string::String .*"
+gdb_test "print str_none" " = core::option::Option<\[a-z\]+::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<\[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 .*"
+ " = simple::NonZeroOptimized::Value\\(\[a-z\]+::string::String .*"
gdb_test "print custom_none" " = simple::NonZeroOptimized::Empty"
proc test_one_slice {svar length base range} {