Remove directory names from gdb.base/batch-exit-status.exp

Adjust gdb.base/batch-exit-status.exp so that test prefixes don't show
directory names for the source scripts passed with -x, to make test
results from different build directories comparable.

gdb/testsuite/ChangeLog:
2019-08-01  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>

	* gdb.base/batch-exit-status.exp: Call test_exit_status with
	prefix argument.
	(test_exit_status): Add prefix argument.
This commit is contained in:
Pedro Franco de Carvalho 2019-08-01 16:51:44 -03:00
parent e0d0c518da
commit 0eba165a74
2 changed files with 26 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2019-08-01 Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
* gdb.base/batch-exit-status.exp: Call test_exit_status with
prefix argument.
(test_exit_status): Add prefix argument.
2019-08-01 Tom de Vries <tdevries@suse.de>
PR testsuite/24863

View File

@ -43,28 +43,36 @@ proc _test_exit_status {expect_status cmdline_opts} {
}
}
proc test_exit_status {expect_status cmdline_opts} {
with_test_prefix $cmdline_opts {
proc test_exit_status {expect_status cmdline_opts prefix} {
if { $prefix == "" } {
set prefix $cmdline_opts
}
with_test_prefix $prefix {
_test_exit_status $expect_status $cmdline_opts
}
}
# gdb -batch with nothing to do should exit 0.
test_exit_status 0 "-batch"
test_exit_status 0 "-batch" ""
# Bad command-line options should cause exit 1.
test_exit_status 1 "-batch -jslkflsdjlkfjlksdjf"
test_exit_status 1 "-batch -jslkflsdjlkfjlksdjf" ""
# gdb -batch with good commands should exit 0.
test_exit_status 0 "-batch -ex \"info source\""
test_exit_status 0 "-batch -x $good_commands"
test_exit_status 0 "-batch -ex \"info source\"" ""
test_exit_status 0 "-batch -x $good_commands" "-batch -x good-commands"
# gdb -batch with bad commands should exit 1.
test_exit_status 1 "-batch -ex \"set not-a-thing 4\""
test_exit_status 1 "-batch -x $bad_commands"
test_exit_status 1 "-batch -ex \"set not-a-thing 4\"" ""
test_exit_status 1 "-batch -x $bad_commands" "-batch -x bad-commands"
# Success or failure of the last thing determines the exit code.
test_exit_status 0 "-batch -ex \"set not-a-thing 4\" -x $good_commands"
test_exit_status 0 "-batch -x $bad_commands -ex \"info source\""
test_exit_status 1 "-batch -x $good_commands -x $bad_commands"
test_exit_status 1 "-batch -x $good_commands -ex \"set not-a-thing 4\""
test_exit_status 0 "-batch -ex \"set not-a-thing 4\" -x $good_commands" \
"-batch -ex \"set not-a-thing 4\" -x good-commands"
test_exit_status 0 "-batch -x $bad_commands -ex \"info source\"" \
"-batch -x bad-commands -ex \"info source\""
test_exit_status 1 "-batch -x $good_commands -x $bad_commands" \
"-batch -x good-commands -x bad-commands"
test_exit_status 1 "-batch -x $good_commands -ex \"set not-a-thing 4\"" \
"-batch -x good-commands -ex \"set not-a-thing 4\""