From: Tom de Vries Date: Wed, 28 Oct 2020 20:04:12 +0000 (+0100) Subject: [gdb/testsuite] Fix re-read FAILs with -readnow X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=efe9b873931dd0954c11fafd32ff267dc863f669;p=binutils-gdb.git [gdb/testsuite] Fix re-read FAILs with -readnow When running the testsuite with target board readnow, we run into: ... FAIL: gdb.ada/exec_changed.exp: start second FAIL: gdb.ada/exec_changed.exp: start just first FAIL: gdb.base/reread.exp: opts= "" "" : run to foo() second time FAIL: gdb.base/reread.exp: opts= "" "" : second pass: run to foo() second time FAIL: gdb.base/reread.exp: opts= "-fPIE" "ldflags=-pie" : \ run to foo() second time FAIL: gdb.base/reread.exp: opts= "-fPIE" "ldflags=-pie" : second pass: \ run to foo() second time ... These are FAILs due to PR26800. Mark these as KFAILs. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-10-28 Tom de Vries * gdb.ada/exec_changed.exp: Add KFAILs for -readnow. * gdb.base/reread.exp: Same. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a0cdd70b760..370a733d9d4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-10-28 Tom de Vries + + * gdb.ada/exec_changed.exp: Add KFAILs for -readnow. + * gdb.base/reread.exp: Same. + 2020-10-28 Tom de Vries * lib/gdb.exp (readnow): Handle arg. diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp index d8ee7597feb..ba14c0e68f4 100644 --- a/gdb/testsuite/gdb.ada/exec_changed.exp +++ b/gdb/testsuite/gdb.ada/exec_changed.exp @@ -51,6 +51,8 @@ gdb_reinitialize_dir $srcdir/$subdir gdb_test "shell mv ${binfile} ${common_binfile}" ".*" "" gdb_load ${common_binfile} +set readnow_p [readnow ${common_binfile}] + # Start the program, we should land in the program main procedure if { [gdb_start_cmd] < 0 } { untested start @@ -76,6 +78,9 @@ gdb_test "shell touch ${common_binfile}" ".*" "" if { [gdb_start_cmd] < 0 } { fail "start second" } else { + if { $readnow_p } { + setup_kfail "gdb/26800" *-*-* + } gdb_test "" \ "second \\(\\) at .*second.adb.*" \ "start second" @@ -103,6 +108,9 @@ if { [gdb_start_cmd] < 0 } { gdb_test_no_output "set \$check_gdb_running = 0" "check gdb running" fail "start just first" } else { + if { $readnow_p } { + setup_kfail "gdb/26800" *-*-* + } gdb_test "" \ "first \\(\\) at .*first.adb.*" \ "start just first" diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp index f824156cc39..52c4da79dbd 100644 --- a/gdb/testsuite/gdb.base/reread.exp +++ b/gdb/testsuite/gdb.base/reread.exp @@ -67,6 +67,8 @@ foreach_with_prefix opts { gdb_rename_execfile ${binfile1} ${binfile} gdb_load ${binfile} + set readnow_p [readnow ${binfile}] + # Set a breakpoint at foo gdb_test "break foo" \ @@ -97,6 +99,9 @@ foreach_with_prefix opts { unsupported $test } else { gdb_run_cmd + if { $readnow_p } { + setup_kfail "gdb/26800" *-*-* + } gdb_test "" "Breakpoint.* foo .* at .*:9.*" $test } @@ -133,6 +138,9 @@ foreach_with_prefix opts { gdb_rename_execfile ${binfile} ${binfile1} gdb_rename_execfile ${binfile2} ${binfile} gdb_run_cmd + if { $readnow_p } { + setup_kfail "gdb/26800" *-*-* + } gdb_test "" "Breakpoint.* foo .* at .*:9.*" \ "second pass: run to foo() second time" }