From dd5770645b35fd9ae2cf6f86f8e73f2eaaf3bbf2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 18 Aug 2012 00:18:31 +0000 Subject: Remove extra verbose before binutils_run * binutils-all/ar.exp (long_filenames): Remove extra verbose before binutils_run. (thin_archive): Likewise. (thin_archive_with_nested): Likewise. Also run bfdtest1 on $archive2. --- binutils/testsuite/ChangeLog | 8 ++++++++ binutils/testsuite/binutils-all/ar.exp | 13 ++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'binutils') diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index d7d3a043a9..276f0cf41a 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-08-17 H.J. Lu + + * binutils-all/ar.exp (long_filenames): Remove extra verbose + before binutils_run. + (thin_archive): Likewise. + (thin_archive_with_nested): Likewise. Also run bfdtest1 on + $archive2. + 2012-08-16 H.J. Lu PR binutils/14481 diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp index c66c43ed63..05cc261041 100644 --- a/binutils/testsuite/binutils-all/ar.exp +++ b/binutils/testsuite/binutils-all/ar.exp @@ -1,4 +1,4 @@ -# Copyright 1995, 1997, 2002, 2004, 2007, 2008, 2009, 2010 +# Copyright 1995, 1997, 2002, 2004, 2007, 2008, 2009, 2010, 2012 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -118,7 +118,6 @@ proc long_filenames { } { remote_file host delete $file2 } - verbose -log "$AR x $dest" set exec_output [binutils_run $AR "x $dest"] set exec_output [prune_warnings $exec_output] if ![string match "" $exec_output] { @@ -127,7 +126,6 @@ proc long_filenames { } { return } - verbose -log "$bfdtest1 $dest" set exec_output [binutils_run $bfdtest1 "$dest"] if ![string match "" $exec_output] { verbose -log $exec_output @@ -261,7 +259,6 @@ proc thin_archive { } { return } - verbose -log "$bfdtest1 $archive" set exec_output [binutils_run $bfdtest1 "$archive"] if ![string match "" $exec_output] { verbose -log $exec_output @@ -327,7 +324,6 @@ proc thin_archive_with_nested { } { return } - verbose -log "$bfdtest1 $archive" set exec_output [binutils_run $bfdtest1 "$archive"] if ![string match "" $exec_output] { verbose -log $exec_output @@ -335,6 +331,13 @@ proc thin_archive_with_nested { } { return } + set exec_output [binutils_run $bfdtest1 "$archive2"] + if ![string match "" $exec_output] { + verbose -log $exec_output + fail "$testname (bfdtest1)" + return + } + set got [binutils_run $NM "--print-armap $archive"] if { ![string match "*text_symbol in *bintest.o*" $got] \ || ![string match "*data_symbol in *bintest.o*" $got] \ -- cgit v1.2.1