From aec288a2f4180330943665dd06f76a4c0eb1abb8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 9 May 2011 15:40:54 -0600 Subject: [PATCH] gcc-gdb-test.exp (gdb-test): Reorder matchers to give more consistent results. * lib/gcc-gdb-test.exp (gdb-test): Reorder matchers to give more consistent results. From-SVN: r173595 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/lib/gcc-gdb-test.exp | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b7aa65640a0..0b9b1192279 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,10 @@ +2011-05-09 Jeff Law + + * lib/gcc-gdb-test.exp (gdb-test): Reorder matchers to give more + consistent results. + 2011-05-09 Fabien Chêne + PR c++/20039 * g++.dg/init/pr20039.C: New. diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp index c8933c2b930..22e7a491873 100644 --- a/gcc/testsuite/lib/gcc-gdb-test.exp +++ b/gcc/testsuite/lib/gcc-gdb-test.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -60,6 +60,12 @@ proc gdb-test { args } { } remote_expect target [timeout_value] { + # Too old GDB + -re "Unhandled dwarf expression|Error in sourced command file" { + unsupported "$testname" + remote_close target + return + } -re {[\n\r]\$1 = ([^\n\r]*)[\n\r]+\$2 = ([^\n\r]*)[\n\r]} { set first $expect_out(1,string) set second $expect_out(2,string) @@ -72,12 +78,6 @@ proc gdb-test { args } { remote_close target return } - # Too old GDB - -re "Unhandled dwarf expression|Error in sourced command file" { - unsupported "$testname" - remote_close target - return - } timeout { unsupported "$testname" remote_close target -- 2.30.2