From 326afb722951cacc6131e2d6d1511986748ca017 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 17 Aug 2020 10:45:49 -0600 Subject: Update xfail pattern in gdb.rust/simple.exp In PR rust/26197, Tom de Vries notes that the variant part rewrite caused some regressions for the Rust compiler he has. This compiler is unusual in that it combines a relatively recent rustc with a relatively old LLVM -- so variant parts are not emitted using DWARF. Most of the bugs in that PR were already fixed by earlier patches, but some lingered. After some research we found that some of these never did work -- which is consistent with the investigations we did into the debug info -- but instead were xfail'd. This patch updates the xfails to cope with the new output. (After this, just one failure remains.) Tom de Vries tested this using his rustc and suggested a fix that appears in this version. gdb/testsuite/ChangeLog 2020-08-17 Tom de Vries Tom Tromey PR rust/26197: * gdb.rust/simple.exp (xfail_pattern): Update for new failure. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.rust/simple.exp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9fdbcb8..7c62458 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-08-17 Tom de Vries + Tom Tromey + + PR rust/26197: + * gdb.rust/simple.exp (xfail_pattern): Update for new failure. + 2020-08-17 Tom Tromey * gdb.ada/mi_var_access.exp: New file. diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index f0cad4e..b32eaf1 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -239,7 +239,8 @@ gdb_test "print .." " = .*::ops::RangeFull" set pass_pattern \ " = core::option::Option<\[a-z\]+::string::String>::Some\\(\[a-z\]+::string::String .*" -set xfail_pattern " = " +set xfail_pattern \ + "( = |That operation is not available on .*)" gdb_test_multiple "print str_some" "" { -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" { pass $gdb_test_name -- cgit v1.1