From d95edb60be9f66cb4797130c8902bf5814b19448 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 21 Nov 2021 00:55:01 +0000 Subject: [PATCH] gdb/testsuite: Remove duplicates from gdb.base/set-cfd.exp When running the testsuite, I have: Running .../gdb/testsuite/gdb.base/set-cwd.exp ... DUPLICATE: gdb.base/set-cwd.exp: test_cwd_reset: continue to breakpoint: break-here Fix by moving the tests after the 'runto_main' within the same with_test_prefix scope. While at it, I fix some indentation issues. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/set-cwd.exp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/set-cwd.exp index 5a4241fd107..172d603f734 100644 --- a/gdb/testsuite/gdb.base/set-cwd.exp +++ b/gdb/testsuite/gdb.base/set-cwd.exp @@ -43,15 +43,15 @@ proc_with_prefix test_tilde_expansion { } { set home "" set test "print home var" gdb_test_multiple "print home" $test { - -re "\\\$$decimal = $hex \"\(.+\)\"\r\n$gdb_prompt $" { - set home $expect_out(1,string) - pass $test - } + -re "\\\$$decimal = $hex \"\(.+\)\"\r\n$gdb_prompt $" { + set home $expect_out(1,string) + pass $test + } } if { $home == "" } { - untested "could not retrieve home var" - return + untested "could not retrieve home var" + return } set curdir "" @@ -177,13 +177,13 @@ proc_with_prefix test_cwd_reset { } { if { ![runto_main] } { return -1 } - } - gdb_breakpoint [gdb_get_line_number "break-here"] - gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_breakpoint [gdb_get_line_number "break-here"] + gdb_continue_to_breakpoint "break-here" ".* break-here .*" - gdb_test "print dir" "\\\$$decimal = \"$gdb_cwd\", .*" \ - "inferior cwd got reset correctly" + gdb_test "print dir" "\\\$$decimal = \"$gdb_cwd\", .*" \ + "inferior cwd got reset correctly" + } } test_cd_into_dir -- 2.30.2