[testsuite patch] Fix false FAIL in stap-probe.exp

[Jan Kratochvil <jan.kratochvil@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 925 bytes --]

Hi,

gcc-6.2.1-1.fc26.x86_64

    # Set a breakpoint with multiple probe locations.
    gdb_test "break -pstap test:two" \
        "Breakpoint \[0-9\]+ at $hex.*2 locations.*" \
        "set multi-location probe breakpoint (probe two)"
break -pstap test:two^M
Breakpoint 2 at 0x4004e0^M
(gdb) FAIL: gdb.base/stap-probe.exp: without semaphore, optimized: set multi-location probe breakpoint (probe two)

    # Set a breakpoint with multiple probe locations.
    # In this scenario, we may expect more than 2 locations because of
    # the optimizations (inlining, loop unrolling, etc).
    gdb_test "break -pstap test:two" \
        "Breakpoint .* at $hex.*\[0-9\]+ locations.*" \
        "set multi-location probe breakpoint (probe two)"
break -pstap test:two^M
Breakpoint 2 at 0x4004e0^M
(gdb) FAIL: gdb.base/stap-probe.exp: with semaphore, optimized: set multi-location probe breakpoint (probe two)

OK for check-in?


Jan

[-- Attachment #2: 1 --]
[-- Type: text/plain, Size: 841 bytes --]

gdb/testsuite/ChangeLog
2016-09-11  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.base/stap-probe.exp (stap_test_no_debuginfo): Try to use
	-fno-ipa-icf.

diff --git a/gdb/testsuite/gdb.base/stap-probe.exp b/gdb/testsuite/gdb.base/stap-probe.exp
index df46e80..9258926 100644
--- a/gdb/testsuite/gdb.base/stap-probe.exp
+++ b/gdb/testsuite/gdb.base/stap-probe.exp
@@ -97,8 +97,11 @@ proc stap_test_no_debuginfo {exec_name {arg ""}} {
     global testfile hex
 
     if {[prepare_for_testing ${testfile}.exp ${exec_name} ${testfile}.c \
-	   {$arg nodebug optimize=-O2}]} {
-	return -1
+	   {$arg nodebug optimize=-O2 "additional_flags=-fno-ipa-icf"}]} {
+	if {[prepare_for_testing ${testfile}.exp ${exec_name} ${testfile}.c \
+	       {$arg nodebug optimize=-O2}]} {
+	    return -1
+	}
     }
 
     if {[runto "-pstap test:user"]} {