From bf6be0f482c67d805e3b67aa424e4f5b0126bcfd Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 6 Jun 2013 19:00:13 +0000 Subject: [PATCH] * gdb.base/dump.exp (capture_value): Don't put expression into test name if arguments passed in. Rename a couple more tests to make them unique. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/dump.exp | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 22941c120e0..f4b9adefb07 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-06-06 Tom Tromey + + * gdb.base/dump.exp (capture_value): Don't put expression into + test name if arguments passed in. + Rename a couple more tests to make them unique. + 2013-06-06 Tom Tromey * gdb.base/break-always.exp: Explicitly specify test name. diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp index 17202a8fe60..b2d0b3a17a0 100644 --- a/gdb/testsuite/gdb.base/dump.exp +++ b/gdb/testsuite/gdb.base/dump.exp @@ -129,8 +129,9 @@ proc capture_value { expression args } { set output_string "" if {[llength $args] > 0} { - # Convert $args into a simple string. - set test "[join $args]; capture $expression" + # Convert $args into a simple string and don't use EXPRESSION + # in the test name. + set test "[join $args]; capture" } { set test "capture $expression" } @@ -440,14 +441,14 @@ gdb_test_multiple "set endian $endian" "set endianness" { # Reload saved values one by one, and compare. if { ![string compare $array_val \ - [capture_value "intarray" "file binfile"]] } then { + [capture_value "intarray" "file binfile; intarray"]] } then { fail "start with intarray un-initialized" } else { pass "start with intarray un-initialized" } if { ![string compare $struct_val \ - [capture_value "intstruct" "file binfile"]] } then { + [capture_value "intstruct" "file binfile; intstruct"]] } then { fail "start with intstruct un-initialized" } else { pass "start with intstruct un-initialized" -- 2.30.2