diff mbox

[2/2] testsuite: Disable backslash_in_multi_line_command_test for old DejaGnus

Message ID 20170313212749.9607-2-simon.marchi@ericsson.com
State New, archived
Headers

Commit Message

Simon Marchi March 13, 2017, 9:27 p.m. UTC 
  I noticed that backslash_in_multi_line_command_test in
gdb.base/commands.exp failed on our RHEL6 servers.  I traced it to the
old version of DejaGnu (1.4.4).  I have found that instead of receiving
the expected:

  "print \\\nargc\n"

gdb received:

  "print  argc\n"

thus breaking the test and its purpose.  Versionof DejaGnu < 1.5 mess
up sending "\\\n", it somehow gets replaced with a space.  I found that
the following commit in DejaGnu fixed the issue:

http://git.savannah.gnu.org/cgit/dejagnu.git/commit/lib/remote.exp?id=3f39294f5cd6802858838d3bcc0ccce847ae17f2

Even though the commit is almost 10 years old, the following release of
DejaGnu was only in 2013, which is why we still have systems with the
old code.

If the DejaGnu version is < 1.5, we just skip the test.

gdb/testsuite/ChangeLog:

	* gdb.base/commands.exp (backslash_in_multi_line_command_test):
	Skip for versions of DejaGnu < 1.5.
---
 gdb/testsuite/gdb.base/commands.exp | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Pedro Alves March 13, 2017, 9:54 p.m. UTC | #1 
OK.

Thanks,
Pedro Alves

On 03/13/2017 09:27 PM, Simon Marchi wrote:
> I noticed that backslash_in_multi_line_command_test in
> gdb.base/commands.exp failed on our RHEL6 servers.  I traced it to the
> old version of DejaGnu (1.4.4).  I have found that instead of receiving
> the expected:
> 
>   "print \\\nargc\n"
> 
> gdb received:
> 
>   "print  argc\n"
> 
> thus breaking the test and its purpose.  Versionof DejaGnu < 1.5 mess
> up sending "\\\n", it somehow gets replaced with a space.  I found that
> the following commit in DejaGnu fixed the issue:
> 
> http://git.savannah.gnu.org/cgit/dejagnu.git/commit/lib/remote.exp?id=3f39294f5cd6802858838d3bcc0ccce847ae17f2
> 
> Even though the commit is almost 10 years old, the following release of
> DejaGnu was only in 2013, which is why we still have systems with the
> old code.
> 
> If the DejaGnu version is < 1.5, we just skip the test.
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 6d3c398c6e..4963743d2b 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -1007,6 +1007,17 @@  proc_with_prefix redefine_backtrace_test {} {
 # while entering a multi-line command (in a secondary prompt).
 
 proc_with_prefix backslash_in_multi_line_command_test {} {
+    set dg_ver [dejagnu_version]
+    set dg_major [lindex $dg_ver 0]
+    set dg_minor [lindex $dg_ver 1]
+
+    # With older versions of DejaGnu, the "\\\n" we send gets replaced with a
+    # space, thus breaking the test.  Just skip it in that case.
+    if { $dg_major == 1 && $dg_minor < 5 } {
+	untested "dejagnu version is too old"
+	return
+    }
+
     gdb_breakpoint "main"
 
     gdb_test_multiple "commands" "commands" {