aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.base
diff options
context:
space:
mode:
authorPedro Franco de Carvalho <pedromfc@linux.ibm.com>2019-08-01 16:51:44 -0300
committerPedro Franco de Carvalho <pedromfc@linux.ibm.com>2019-08-01 16:51:44 -0300
commit0eba165a74cdb039a5e6ed86e0396d80f68ca22c (patch)
tree1372d34e0642bd50dbad017448118e32c84d8243 /gdb/testsuite/gdb.base
parente0d0c518daa5e10a417d16ad8158e97016562342 (diff)
downloadgdb-0eba165a74cdb039a5e6ed86e0396d80f68ca22c.zip
gdb-0eba165a74cdb039a5e6ed86e0396d80f68ca22c.tar.gz
gdb-0eba165a74cdb039a5e6ed86e0396d80f68ca22c.tar.bz2
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.
Diffstat (limited to 'gdb/testsuite/gdb.base')
-rw-r--r--gdb/testsuite/gdb.base/batch-exit-status.exp32
1 files changed, 20 insertions, 12 deletions
diff --git a/gdb/testsuite/gdb.base/batch-exit-status.exp b/gdb/testsuite/gdb.base/batch-exit-status.exp
index 6e434e4..0f89115 100644
--- a/gdb/testsuite/gdb.base/batch-exit-status.exp
+++ b/gdb/testsuite/gdb.base/batch-exit-status.exp
@@ -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\""