Fix some test cases after LLVM improvements to omit is_stmt for multiple line entries on the same line (due to column or discriminator changes)
llvm-svn: 225032
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
index aa59435..b782c36 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-precsave.exp
@@ -78,7 +78,6 @@
"set bp, 2nd instr"
set testmsg "stopped at bp, 2nd instr"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
gdb_test_multiple "step" $testmsg {
-re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" {
set stop_addr $expect_out(1,string)
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
index a1c3b5a..06433a0 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/consecutive-reverse.exp
@@ -58,7 +58,6 @@
"set bp, 2nd instr"
set testmsg "stopped at bp, 2nd instr"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
gdb_test_multiple "step" $testmsg {
-re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" {
set stop_addr $expect_out(1,string)
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-precsave.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-precsave.exp
index a09b023..f933208 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -139,19 +139,16 @@
# Test reverse-step into debuggable solib function
#
-# multiple failures here, haven't bothered to match/diagnose them precisely
-# Clang 14580 means reverse stepping will reach the return, not the
-# '}'
-# GDB 17701 means reverse stepping will step to the assignment
-# after the call before stepping back into the call
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
-gdb_test "reverse-step" "${libsrc}.*\}" "reverse-step into solib function one"
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
+if [using_clang] { setup_xfail "clang/14580" *-*-* }
+if ![gdb_test "reverse-step" "${libsrc}.*\}" "reverse-step into solib function one"] {
+ gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
+}
gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
-gdb_test "reverse-step" "${libsrc}.*\}" "reverse-step into solib function two"
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
+if [using_clang] { setup_xfail "clang/14580" *-*-* }
+if ![gdb_test "reverse-step" "${libsrc}.*\}" "reverse-step into solib function two"] {
+ gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
+}
gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"
#
@@ -161,5 +158,4 @@
gdb_test "until $end_part_two" " end part two.*" "run until end part two"
gdb_test "reverse-next" " middle part two.*" "reverse-next over solib function one"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
gdb_test "reverse-next" " begin part two.*" "reverse-next over solib function two"
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-reverse.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-reverse.exp
index 3037278..f79dc52 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -106,19 +106,16 @@
# Test reverse-step into debuggable solib function
#
-# multiple failures here, haven't bothered to match/diagnose them precisely
-# Clang 14580 means reverse stepping will reach the return, not the
-# '}'
-# GDB 17701 means reverse stepping will step to the assignment
-# after the call before stepping back into the call
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
-gdb_test "reverse-step" "}" "reverse-step into solib function one"
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
+if [using_clang] { setup_xfail "clang/14580" *-*-* }
+if ![gdb_test "reverse-step" "}" "reverse-step into solib function one"] {
+ gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
+}
gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
-gdb_test "reverse-step" "}" "reverse-step into solib function two"
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
+if [using_clang] { setup_xfail "clang/14580" *-*-* }
+if ![gdb_test "reverse-step" "}" "reverse-step into solib function two"] {
+ gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
+}
gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"
#
@@ -128,5 +125,4 @@
gdb_test "until $end_part_two" " end part two.*" "run until end part two"
gdb_test "reverse-next" " middle part two.*" "reverse-next over solib function one"
-if [using_clang] { setup_kfail "gdb/17701" *-*-* }
gdb_test "reverse-next" " begin part two.*" "reverse-next over solib function two"
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
index 5e7e645..e701795 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -258,25 +258,20 @@
# step backward out of called function (thru call)
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn"
# next backward over call
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call"
# step/next backward with count
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "step 3" ".*REVERSE STEP TEST 1.*" "reverse step test 1"
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next 2" ".*REVERSE NEXT TEST 1.*" "reverse next test 1"
# step/next backward without count
gdb_test "step" ".*STEP TEST 1.*" "reverse step test 2"
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next" ".*NEXT TEST 1.*" "reverse next test 2"
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
index 7d84143..e33d026 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
@@ -238,25 +238,20 @@
# step backward out of called function (thru call)
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn"
# next backward over call
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call"
# step/next backward with count
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "step 3" ".*REVERSE STEP TEST 1.*" "reverse step test 1"
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next 2" ".*REVERSE NEXT TEST 1.*" "reverse next test 1"
# step/next backward without count
gdb_test "step" ".*STEP TEST 1.*" "reverse step test 2"
-if [using_clang] { setup_xfail "PR 20284" *-*-* }
gdb_test "next" ".*NEXT TEST 1.*" "reverse next test 2"
