More test case cleanup for GDB PR17701 due to improved column info in Clang
llvm-svn: 224220
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 06433a0..a1c3b5a 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,6 +58,7 @@
"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 efc4ef3..a09b023 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
@@ -145,19 +145,13 @@
# 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" *-*-* }
-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"
-} else {
- gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
-}
+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" *-*-* }
-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"
-} else {
- gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
-}
+gdb_test "reverse-step" "${libsrc}.*\}" "reverse-step into solib function two"
+gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
gdb_test "reverse-step" " begin part two.*" "reverse-step back to main 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 f79dc52..3037278 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,16 +106,19 @@
# Test reverse-step into debuggable solib function
#
-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"
-}
+# 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"
gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
-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"
-}
+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"
gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"
#
@@ -125,4 +128,5 @@
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"
