Simplify/revert some test cases that now pass.
(changing LLVM to only put is_stmt at the start of a line helps with several of these tests)
llvm-svn: 225025
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/consecutive.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/consecutive.exp
index 4a95d5b..5036274 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/consecutive.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/consecutive.exp
@@ -62,7 +62,6 @@
gdb_test "break \*$bp_addr" "Breakpoint $decimal at $bp_addr: file .*" \
"set bp, 2nd instr"
-if [using_clang] { setup_kfail gdb/17701 *-*-* }
gdb_test_multiple "step" "stopped at bp, 2nd instr" {
-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.base/skip.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
index 07d9837..b17df04 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
@@ -126,12 +126,7 @@
gdb_test "step" ".*" "step after disabling 3 (2)"; # Return from foo()
}
# account for differing order of evaluation of function operands
-if [using_clang] {
- setup_xfail "works in gdb trunk" *-*-*
- gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (3)"
-} else {
- gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)"
-}
+gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)"
if ![using_clang] { # Clang PR14580
gdb_test "step" ".*" "step after disabling 3 (4)"; # Return from bar()
}
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/watchpoint.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/watchpoint.exp
index 0d78be9..09f2375 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/watchpoint.exp
@@ -327,15 +327,7 @@
set test "until out of loop"
gdb_test_multiple "until" $test {
-re "(for \\(count = 0|\}).*$gdb_prompt $" {
- gdb_test_multiple "until" $test {
- -re "ival = count; /. Outside loop ./.*$gdb_prompt $" {
- pass $test
- }
- -re "ival1 = count.*$gdb_prompt $" {
- kfail "gdb/17315" $test
- gdb_test "until 181" "ival1 = count; /. Outside loop ./" $test
- }
- }
+ gdb_test "until" "ival1 = count; /. Outside loop ./" $test
}
-re "ival1 = count; /. Outside loop ./.*$gdb_prompt $" {
pass $test
