From c2e827ad5340fcf1735df6c77cb0311e56b985ef Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 13 Apr 2014 11:42:02 -0700 Subject: [PATCH] XFAIL under Clang tests using labels gdb/testsuite/ * gdb.base/label.exp: XFAIL label related tests under Clang. * gdb.cp/cplabel.exp: Ditto. * gdb.linespec/ls-errs.exp: Refactor tests to execute directly and XFAIL under Clang those using labels. --- gdb/testsuite/ChangeLog | 7 ++ gdb/testsuite/gdb.base/label.exp | 10 +++ gdb/testsuite/gdb.cp/cplabel.exp | 1 + gdb/testsuite/gdb.linespec/ls-errs.exp | 108 +++++++++++-------------- 4 files changed, 65 insertions(+), 61 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0cd9d83d86a..25bbc6a6849 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-04-24 David Blaikie + + * gdb.base/label.exp: XFAIL label related tests under Clang. + * gdb.cp/cplabel.exp: Ditto. + * gdb.linespec/ls-errs.exp: Refactor tests to execute directly and XFAIL + under Clang those using labels. + 2014-04-25 Yao Qi * gdb.dwarf2/dwz.exp (Dwarf::assemble): Remove unused diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp index 87f86239b1b..e20ac267ce5 100644 --- a/gdb/testsuite/gdb.base/label.exp +++ b/gdb/testsuite/gdb.base/label.exp @@ -36,24 +36,34 @@ if {![runto_main]} { return -1 } +set has_pr_14500_fixed 1 +if {[test_compiler_info {clang-*-*}]} { + set has_pr_14500_fixed 0 +} + +if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "break here" \ "Breakpoint.*at.*" \ "breakpoint here" +if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "break main:there" \ "Breakpoint.*at.*" \ "breakpoint there" +if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 3,.*" \ "continue to 'there'" +if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 2,.*" \ "continue to 'here'" rerun_to_main +if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 3,.*" \ "continue to 'there' after re-run" diff --git a/gdb/testsuite/gdb.cp/cplabel.exp b/gdb/testsuite/gdb.cp/cplabel.exp index a9cbfec458b..9c0e7fe0bae 100644 --- a/gdb/testsuite/gdb.cp/cplabel.exp +++ b/gdb/testsuite/gdb.cp/cplabel.exp @@ -34,6 +34,7 @@ set labels {"to_the_top" "get_out_of_here"} foreach m $methods { foreach l $labels { set line [gdb_get_line_number "$m:$l"] + if {[test_compiler_info {clang-*-*}]} { setup_xfail clang/14500 *-*-* } gdb_test "break foo::$m:$l" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $line\." } diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp index dbff230aec6..86056c51b02 100644 --- a/gdb/testsuite/gdb.linespec/ls-errs.exp +++ b/gdb/testsuite/gdb.linespec/ls-errs.exp @@ -28,16 +28,12 @@ gdb_test_no_output "set breakpoint pending off" # We intentionally do not use gdb_breakpoint for these tests. -# Add the (invalid) LINESPEC to the test array named in ARRAY_NAME. -# Use the index into ::error_messages MSG_ID and ARGS to create -# an error message which is the expect result of attempting to -# break on the given LINESPEC. -proc add {array_name linespec msg_id args} { +# Break at 'linespec' and expect the message in ::error_messages indexed by +# msg_id with the associated args. +proc test_break {linespec msg_id args} { global error_messages - upvar $array_name tests - lappend tests(linespecs) $linespec - set tests("$linespec") [string_to_regexp \ + gdb_test "break $linespec" [string_to_regexp \ [eval format \$error_messages($msg_id) $args]] } @@ -64,15 +60,9 @@ set spaces [list ":" ": " " :" " : " "\t: " " :\t" "\t:\t" " \t:\t " \ # A list of invalid offsets. set invalid_offsets [list -100 +500 1000] -# THE_TESTS will hold all of our test information. Array index -# "linespecs" will contain the complete list of all linespecs -# to be tested. An array index of \"$linespec\" will contain -# the expected result. -set the_tests(linespecs) {} - # Try some simple, invalid linespecs involving spaces. foreach x $spaces { - add the_tests $x unexpected "colon" + test_break $x unexpected "colon" } # Test invalid filespecs starting with offset. This is done @@ -86,25 +76,25 @@ foreach x $invalid_offsets { [string index $x 0] == "-"} { incr offset 16 } - add the_tests $x invalid_offset $offset + test_break $x invalid_offset $offset } # Test offsets with trailing tokens w/ and w/o spaces. foreach x $spaces { - add the_tests "3$x" unexpected "colon" - add the_tests "+10$x" unexpected "colon" - add the_tests "-10$x" unexpected "colon" + test_break "3$x" unexpected "colon" + test_break "+10$x" unexpected "colon" + test_break "-10$x" unexpected "colon" } foreach x {1 +1 +100 -10} { - add the_tests "3 $x" unexpected_opt "number" $x - add the_tests "+10 $x" unexpected_opt "number" $x - add the_tests "-10 $x" unexpected_opt "number" $x + test_break "3 $x" unexpected_opt "number" $x + test_break "+10 $x" unexpected_opt "number" $x + test_break "-10 $x" unexpected_opt "number" $x } -add the_tests "3 foo" unexpected_opt "string" "foo" -add the_tests "+10 foo" unexpected_opt "string" "foo" -add the_tests "-10 foo" unexpected_opt "string" "foo" +test_break "3 foo" unexpected_opt "string" "foo" +test_break "+10 foo" unexpected_opt "string" "foo" +test_break "-10 foo" unexpected_opt "string" "foo" # Test invalid linespecs starting with filename. foreach x [list "this_file_doesn't_exist.c" \ @@ -118,74 +108,70 @@ foreach x [list "this_file_doesn't_exist.c" \ "\"spaces: and :colons.c\"" \ "'more: :spaces: :and colons::.c'"] { # Remove any quoting from FILENAME for the error message. - add the_tests "$x:3" invalid_file [string trim $x \"'] + test_break "$x:3" invalid_file [string trim $x \"'] } # Test unmatched quotes. foreach x {"\"src-file.c'" "'src-file.c"} { - add the_tests "$x:3" unmatched_quote + test_break "$x:3" unmatched_quote } -add the_tests $srcfile invalid_function $srcfile +test_break $srcfile invalid_function $srcfile foreach x {"foo" " foo" " foo "} { # Trim any leading/trailing whitespace for error messages. - add the_tests "$srcfile:$x" invalid_function_f [string trim $x] $srcfile - add the_tests "$srcfile:main:$x" invalid_label [string trim $x] "main" + test_break "$srcfile:$x" invalid_function_f [string trim $x] $srcfile + test_break "$srcfile:main:$x" invalid_label [string trim $x] "main" } foreach x $spaces { - add the_tests "$srcfile$x" unexpected "end of input" - add the_tests "$srcfile:main$x" unexpected "end of input" + test_break "$srcfile$x" unexpected "end of input" + test_break "$srcfile:main$x" unexpected "end of input" } -add the_tests "${srcfile}::" invalid_function "${srcfile}::" -add the_tests "$srcfile:3 1" unexpected_opt "number" "1" -add the_tests "$srcfile:3 +100" unexpected_opt "number" "+100" -add the_tests "$srcfile:3 -100" unexpected_opt "number" "-100" -add the_tests "$srcfile:3 foo" unexpected_opt "string" "foo" +test_break "${srcfile}::" invalid_function "${srcfile}::" +test_break "$srcfile:3 1" unexpected_opt "number" "1" +test_break "$srcfile:3 +100" unexpected_opt "number" "+100" +test_break "$srcfile:3 -100" unexpected_opt "number" "-100" +test_break "$srcfile:3 foo" unexpected_opt "string" "foo" foreach x $invalid_offsets { - add the_tests "$srcfile:$x" invalid_offset_f $x $srcfile - add the_tests "\"$srcfile:$x\"" invalid_offset_f $x $srcfile - add the_tests "'$srcfile:$x'" invalid_offset_f $x $srcfile + test_break "$srcfile:$x" invalid_offset_f $x $srcfile + test_break "\"$srcfile:$x\"" invalid_offset_f $x $srcfile + test_break "'$srcfile:$x'" invalid_offset_f $x $srcfile } # Test invalid filespecs starting with function. foreach x {"foobar" "foo::bar" "foo.bar" "foo ." "foo bar" "foo 1" \ "foo 0" "foo +10" "foo -10" "foo +100" "foo -100"} { - add the_tests $x invalid_function $x + test_break $x invalid_function $x } foreach x $spaces { - add the_tests "main${x}there" invalid_label "there" "main" - add the_tests "main:here${x}" unexpected "end of input" + test_break "main${x}there" invalid_label "there" "main" + if {[test_compiler_info {clang-*-*}]} { setup_xfail clang/14500 *-*-* } + test_break "main:here${x}" unexpected "end of input" } -add the_tests "main 3" invalid_function "main 3" -add the_tests "main +100" invalid_function "main +100" -add the_tests "main -100" invalid_function "main -100" -add the_tests "main foo" invalid_function "main foo" +test_break "main 3" invalid_function "main 3" +test_break "main +100" invalid_function "main +100" +test_break "main -100" invalid_function "main -100" +test_break "main foo" invalid_function "main foo" foreach x {"3" "+100" "-100" "foo"} { - add the_tests "main:here $x" invalid_label "here $x" "main" + test_break "main:here $x" invalid_label "here $x" "main" } foreach x {"if" "task" "thread"} { - add the_tests $x invalid_function $x + test_break $x invalid_function $x } -add the_tests "'main.c'flubber" unexpected_opt "string" "flubber" -add the_tests "'main.c',21" invalid_function "main.c" -add the_tests "'main.c' " invalid_function "main.c" -add the_tests "'main.c'3" unexpected_opt "number" "3" -add the_tests "'main.c'+3" unexpected_opt "number" "+3" +test_break "'main.c'flubber" unexpected_opt "string" "flubber" +test_break "'main.c',21" invalid_function "main.c" +test_break "'main.c' " invalid_function "main.c" +test_break "'main.c'3" unexpected_opt "number" "3" +test_break "'main.c'+3" unexpected_opt "number" "+3" # Test undefined convenience variables. set x {$zippo} -add the_tests $x invalid_var_or_func $x -add the_tests "$srcfile:$x" invalid_var_or_func_f $x $srcfile - -# Run the tests -foreach linespec $the_tests(linespecs) { - gdb_test "break $linespec" $the_tests("$linespec") -} +test_break $x invalid_var_or_func $x +test_break "$srcfile:$x" invalid_var_or_func_f $x $srcfile -- 2.30.2