Remove hand-called function from test.

gdb/testsuite/ChangeLog:

	* gdb.base/skip.c (main): Call test_skip_file_and_function.
	* gdb.base/skip.exp: Remove hand calling test_skip_file_and_function.
This commit is contained in:
Doug Evans 2016-03-15 12:44:34 -07:00
parent 4e0c91e454
commit aa52b601cc
3 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2016-03-15 Doug Evans <dje@google.com>
* gdb.base/skip.c (main): Call test_skip_file_and_function.
* gdb.base/skip.exp: Remove hand calling test_skip_file_and_function.
2016-03-14 Simon Marchi <simon.marchi@ericsson.com>
* gdb.base/default.exp: Add $_as_string to the list of expected

View File

@ -21,12 +21,19 @@ int foo (void);
int bar (void);
int baz (int);
void skip1_test_skip_file_and_function (void);
void test_skip_file_and_function (void);
int
main ()
{
int x;
/* Use comma operator to sequence evaluation of bar and foo. */
return baz ((bar (), foo ()));
x = baz ((bar (), foo ()));
test_skip_file_and_function ();
return 0;
}
int

View File

@ -281,17 +281,15 @@ with_test_prefix "step using -rfu for baz" {
# Test -fi + -fu.
with_test_prefix "step using -fi + -fu" {
if ![runto_main] {
fail "Can't run to main"
gdb_test_no_output "skip delete"
if ![runto test_skip_file_and_function no-message] {
fail "Can't run to test_skip_file_and_function"
return
}
gdb_test_no_output "skip delete"
gdb_test "skip -fi skip1.c -fu test_skip" \
"Function test_skip in file skip1.c will be skipped when stepping\."
gdb_breakpoint "test_skip_file_and_function"
gdb_breakpoint "end_test_skip_file_and_function"
gdb_test "call test_skip_file_and_function ()" "silently stop."
# Verify we can step into skip.c:test_skip but not skip1.c:test_skip.
gdb_test "step" "test_skip \\(\\) at.*" "step 1"
gdb_test "step" "test_skip_file_and_function \\(\\) at.*" "step 2"; # Return from test_skip()