From 10067028372e0f50799ec93843490db42c619e39 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 10 Dec 2020 23:44:49 +0100 Subject: [PATCH] [gdb/testsuite] Fix gdb.tui/new-layout.exp with tcl 8.5 In commit 4d91ddd342 "[gdb/testsuite] Fix unbalanced braces in gdb.tui/new-layout.exp", I tried to fix a problem with test-case gdb.tui/new-layout.exp when running with tcl 8.5. However, at that point I only had access to the log containing the failure, and unfortunately my patch turned out not to be effective. So, finally fix this problem by guarding the problematic code with: ... if { [tcl_version_at_least 8 6] } { ... } ... Tested on x86_64-linux, specifically SLE-11 where I ran into the failure. gdb/testsuite/ChangeLog: 2020-12-10 Tom de Vries PR testsuite/26947 * gdb.tui/new-layout.exp: Don't execute tests with unbalanced curly braces for tcl 8.5 and earlier. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.tui/new-layout.exp | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 09cd099b13f..e33626053eb 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-12-10 Tom de Vries + + PR testsuite/26947 + * gdb.tui/new-layout.exp: Don't execute tests with unbalanced curly + braces for tcl 8.5 and earlier. + 2020-12-09 Simon Marchi PR 26875, PR 26901 diff --git a/gdb/testsuite/gdb.tui/new-layout.exp b/gdb/testsuite/gdb.tui/new-layout.exp index d736e7f42f4..cd9b15bcd98 100644 --- a/gdb/testsuite/gdb.tui/new-layout.exp +++ b/gdb/testsuite/gdb.tui/new-layout.exp @@ -44,12 +44,16 @@ gdb_test "tui new-layout example src 1 src 1" \ "Window \"src\" seen twice in layout" gdb_test "tui new-layout example src 1" \ "New layout does not contain the \"cmd\" window" -gdb_test "tui new-layout example src 1\}" \ - "Extra '\}' in layout specification" -gdb_test "tui new-layout example {src 1} 1\}" \ - "Extra '\}' in layout specification" -gdb_test "tui new-layout example \{src 1" \ - "Missing '\}' in layout specification" + +# Avoid unbalanced curly braces problems with tcl 8.5. +if { [tcl_version_at_least 8 6] } { + gdb_test "tui new-layout example src 1\}" \ + "Extra '\}' in layout specification" + gdb_test "tui new-layout example {src 1} 1\}" \ + "Extra '\}' in layout specification" + gdb_test "tui new-layout example \{src 1" \ + "Missing '\}' in layout specification" +} gdb_test_no_output "tui new-layout example asm 1 status 0 cmd 1" -- 2.30.2