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

Message ID 20190730180848.16329-1-pedromfc@linux.ibm.com
State New
Headers show
Series
  • Remove directory names from gdb.base/batch-exit-status.exp
Related show

Commit Message

Pedro Franco de Carvalho July 30, 2019, 6:08 p.m.
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:
YYYY-MM-DD  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.
---
 gdb/testsuite/gdb.base/batch-exit-status.exp | 32 ++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

-- 
2.20.1

Comments

Tom Tromey Aug. 1, 2019, 6:13 p.m. | #1
>>>>> "Pedro" == Pedro Franco de Carvalho <pedromfc@linux.ibm.com> writes:


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

Pedro> gdb/testsuite/ChangeLog:
Pedro> YYYY-MM-DD  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>

Pedro> 	* gdb.base/batch-exit-status.exp: Call test_exit_status with
Pedro> 	prefix argument.
Pedro> 	(test_exit_status): Add prefix argument.

Thanks, this is ok.

Tom
Pedro Franco de Carvalho Aug. 1, 2019, 7:55 p.m. | #2
Tom Tromey <tom@tromey.com> writes:

> Thanks, this is ok.


Thanks! Pushed.

--
Pedro Franco de Carvalho

Patch

diff --git a/gdb/testsuite/gdb.base/batch-exit-status.exp b/gdb/testsuite/gdb.base/batch-exit-status.exp
index 6e434e4a14..0f89115571 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\""