From 7410508723bf20c29ea8d5888eee9c45e5fae0a2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 25 Mar 2022 13:36:32 -0600 Subject: [PATCH] Match rustc beta versions The rust_compiler_version proc extracts the Rust compiler version from the "rustc --version" output. For a beta compiler, the output looks like: rustc 1.60.0-beta.6 (7bccde197 2022-03-22) This patch slightly relaxes the regexp -- removing a space -- so that this can be understood by this proc. --- gdb/testsuite/lib/rust-support.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/rust-support.exp b/gdb/testsuite/lib/rust-support.exp index 0d39566df73..85e5b021e21 100644 --- a/gdb/testsuite/lib/rust-support.exp +++ b/gdb/testsuite/lib/rust-support.exp @@ -104,7 +104,7 @@ gdb_caching_proc rust_compiler_version { } else { set output [lindex [remote_exec host "$rustc --version --verbose"] 1] foreach line [split $output \n] { - if {[regexp "rustc (\[0-9.\]+) .*\$" $output ignore version]} { + if {[regexp "rustc (\[0-9.\]+).*\$" $output ignore version]} { return $version } } -- 2.30.2