[binutils-gdb] [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

[binutils-gdb] [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

[gdb-buildbot]

*** TEST RESULTS FOR COMMIT 6015a0674901be2c3fd24867e1a610d2abf8c1a0 ***

commit 6015a0674901be2c3fd24867e1a610d2abf8c1a0
Author:     Tom de Vries <tdevries@suse.de>
AuthorDate: Mon May 4 08:40:38 2020 +0200
Commit:     Tom de Vries <tdevries@suse.de>
CommitDate: Mon May 4 08:40:38 2020 +0200

    [gdb/testsuite] Fix gdb.base/async.exp with gcc-8
    
    When running test-case gdb.base/async.exp with gcc-8, we run into:
    ...
    FAIL: gdb.base/async.exp: stepi&
    ...
    
    The problem is that with gcc-8, the instruction address is no longer printed:
    ...
     stepi&
    -(gdb) 0x00000000004004b2       9        x = 5; x = 5; x = 5;
    +(gdb) 9         x = 5; x = 5; x = 5;
     completed.
    -PASS: gdb.base/async.exp: stepi&
    +FAIL: gdb.base/async.exp: stepi&
    ...
    
    This is due to the fact that gcc-8 contains more precise line info, making the
    address being stepped to a "recommended breakpoint location", and consequently
    gdb doesn't print the address prefix anymore.
    
    Given that:
    - we step through statements on the same line, and
    - there's no addres prefix anymore,
    this gives the impression of lack of progress, which could be improved upon,
    filed as enhancement PR25911 - "Show column when stepping through line".
    
    Fix the FAIL by checking in the test-case whether addresses are at
    "recommended breakpoint location" or not.
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2020-05-04  Tom de Vries  <tdevries@suse.de>
    
            * gdb.base/async.exp: Check whether instruction addresses are a
            "recommended breakpoint location".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2984996641..409f44ca9d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-04  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/async.exp: Check whether instruction addresses are a
+	"recommended breakpoint location".
+
 2020-05-03  Tom Tromey  <tom@tromey.com>
 
 	* gdb.base/sepdebug.exp: Remove "catch" test.
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index bc46f4b512..bf124ca56a 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -79,7 +79,16 @@ test_background "step&" "" ".*y = foo \\(\\).*" "step& #1"
 
 test_background "step&" "" " foo \\(\\) at .*async.c.*x = 5.*" "step& #2"
 
-test_background "stepi&" "" ".*$hex.*x = 5.*"
+set is_stmt [list]
+gdb_test_multiple "maint info line-table async.c" "" {
+    -re "\r\n$decimal\[ \t\]+$decimal\[ \t\]+($hex)\[ \t\]+Y\[^\r\n\]*" {
+	lappend is_stmt $expect_out(1,string)
+	exp_continue
+    }
+    -re -wrap "" {
+	pass $gdb_test_name
+    }
+}
 
 # Get the next instruction address.
 set next_insn_addr ""
@@ -90,13 +99,46 @@ gdb_test_multiple {x/2i $pc} "$test" {
 	pass "$test"
     }
 }
+set next_insn_is_stmt \
+    [expr [lsearch -regexp $is_stmt 0x0*$next_insn_addr] != -1]
+
+if { $next_insn_is_stmt } {
+    set prefix ""
+} else {
+    # The current PC is printed out.
+    set prefix "0x0*$next_insn_addr.*"
+}
+test_background "stepi&" "" ".*$prefix x = 5; .*"
 
-# We nexti into the same source line.  The current PC is printed out.
-test_background "nexti&" "" ".* 0x0*$next_insn_addr.* x = 5; .*"
-
-# PC is in the middle of a source line, so the PC address is displayed.
+# Get the next instruction address.
+set next_insn_addr ""
+set test "get next insn"
+gdb_test_multiple {x/2i $pc} "$test" {
+    -re "=> $hex .* 0x(\[0-9a-f\]*) .*$gdb_prompt $" {
+	set next_insn_addr $expect_out(1,string)
+	pass "$test"
+    }
+}
+set next_insn_is_stmt \
+    [expr [lsearch -regexp $is_stmt 0x0*$next_insn_addr] != -1]
+
+if { $next_insn_is_stmt } {
+    set prefix ""
+} else {
+    # The current PC is printed out.
+    set prefix "0x0*$next_insn_addr.*"
+}
+# We nexti into the same source line.
+test_background "nexti&" "" ".*$prefix x = 5; .*"
+
+if { $next_insn_is_stmt } {
+    set prefix ""
+} else {
+    # PC is in the middle of a source line, so the PC address is displayed.
+    set prefix "0x0*$next_insn_addr in "
+}
 test_background "finish&" \
-    "Run till exit from #0  $hex in foo \\(\\) at.*async.c.*\r\n" \
+    "Run till exit from #0  ${prefix}foo \\(\\) at.*async.c.*\r\n" \
     ".*$hex in main \\(\\) at.*async.c.*y = foo \\(\\).*Value returned is.*= 8.*"
 
 set jump_here [gdb_get_line_number "jump here"]

Failures on Fedora-i686, branch master

[gdb-buildbot]

Buildername:
        Fedora-i686

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/18/builds/3046

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-i686/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-i686/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-i686/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-cc-with-index, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-cc-with-index

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/20/builds/2995

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> FAIL: gdb.base/step-over-syscall.exp: clone: displaced=off: single step over clone
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i02
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i12
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i22
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print i
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print j
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: single_scope: second thread: print i3
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-m32

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/17/builds/3041

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=1: inferior 1 exited
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-m64, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-m64

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/3/builds/3100

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> FAIL: gdb.multi/multi-arch-exec.exp: first_arch=1: selected_thread=1: follow_exec_mode=new: continue across exec that changes architecture
PASS -> KFAIL: gdb.threads/non-ldr-exit.exp: program exits normally
PASS -> FAIL: gdb.threads/process-dies-while-detaching.exp: single-process: continue: detach: continue
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-native-extended-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-extended-gdbserver-m32

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/4/builds/2936

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> FAIL: gdb.multi/multi-re-run.exp: re_run_inf=2: iter=1: continue until exit
PASS -> FAIL: gdb.multi/multi-re-run.exp: re_run_inf=2: iter=1: print re_run_var_2
new UNRESOLVED: gdb.multi/multi-re-run.exp: re_run_inf=2: iter=2: delete all breakpoints in delete_breakpoints
PASS -> UNRESOLVED: gdb.multi/multi-re-run.exp: re_run_inf=2: iter=2: setting breakpoint at all_started
PASS -> UNRESOLVED: gdb.threads/attach-into-signal.exp: threaded: attach
new FAIL: gdb.threads/attach-into-signal.exp: threaded: thread apply 2 print $_siginfo.si_signo
new KFAIL: gdb.threads/watchthreads2.exp: gdb can drop watchpoints in multithreaded app
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-native-extended-gdbserver-m64, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-extended-gdbserver-m64

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/2/builds/2938

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
FAIL -> UNRESOLVED: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: inferior 1 exited
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i02
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i12
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i22
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print k
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print r
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print z
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print k
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print r
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print z
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 3rd stop: print i
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 3rd stop: print j
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print i
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print j
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i3
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-native-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-gdbserver-m32

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/24/builds/2950

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=1: inferior 1 exited
PASS -> FAIL: gdb.threads/thread-unwindonsignal.exp: continue until exit
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>

Failures on Fedora-x86_64-native-gdbserver-m64, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-gdbserver-m64

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/22/builds/2948

Author:
        Tom de Vries <tdevries@suse.de>

Commit tested:
        6015a0674901be2c3fd24867e1a610d2abf8c1a0

Subject of commit:
        [gdb/testsuite] Fix gdb.base/async.exp with gcc-8

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0/

*** Diff to previous build ***
==============================================
PASS -> FAIL: gdb.base/reread.exp: opts= "-fPIE" "ldflags=-pie" : second pass: run to foo
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print k
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print r
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 2nd thread: print z
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print i
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print j
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print i
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print j
PASS -> KFAIL: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i3
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/60/6015a0674901be2c3fd24867e1a610d2abf8c1a0//xfail.table.gz>