This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Don't call "error" in sysroot-prefix.exp


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ab55d1a098571a559bf75031e1c3e7c914afadd7

commit ab55d1a098571a559bf75031e1c3e7c914afadd7
Author: Alan Modra <amodra@gmail.com>
Date:   Thu Dec 22 12:07:31 2016 +1030

    Don't call "error" in sysroot-prefix.exp
    
    We don't want to report a test failure as a tcl error.
    
    	* testsuite/ld-scripts/sysroot-prefix.exp (sysroot_prefix_test_setup):
    	Call perror rather than error on "as" or "ar" failures.

Diff:
---
 ld/ChangeLog                               | 5 +++++
 ld/testsuite/ld-scripts/sysroot-prefix.exp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1ae4435..e879be4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-22  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-scripts/sysroot-prefix.exp (sysroot_prefix_test_setup):
+	Call perror rather than error on "as" or "ar" failures.
+
 2016-12-21  Igor Kudrin  <ikudrin@accesssoftek.com>
 
 	* ldlang.c (size_input_section): Avoid calling insert_pad
diff --git a/ld/testsuite/ld-scripts/sysroot-prefix.exp b/ld/testsuite/ld-scripts/sysroot-prefix.exp
index 47d0657..8c24471 100644
--- a/ld/testsuite/ld-scripts/sysroot-prefix.exp
+++ b/ld/testsuite/ld-scripts/sysroot-prefix.exp
@@ -81,7 +81,7 @@ proc sysroot_prefix_test_setup { } {
     global as gasopt srcdir subdir ar
 
     if {![ld_assemble_flags $as $gasopt $srcdir/$subdir/pr14962a.s tmpdir/main.o]} {
-	error "Error assembling a trivial file for sysroot-prefix tests framework"
+	perror "Error assembling a trivial file for sysroot-prefix tests framework"
 	return 0
     }
 
@@ -106,13 +106,13 @@ proc sysroot_prefix_test_setup { } {
 	set libnamebase [lindex $test_object 2]
 
 	if ![ld_assemble_flags $as $gasopt $srcdir/$subdir/$sname $oname] {
-	    error "Error assembling trivial file $sname for sysroot-prefix tests framework"
+	    perror "Error assembling trivial file $sname for sysroot-prefix tests framework"
 	    return 0
 	}
 
 	if { [string length $libnamebase] != 0 &&
 	     ![ar_simple_create $ar "" tmpdir/sysroot/tmp/ldtest-xyzzy/lib$libnamebase.a $oname] } {
-	    error "Error creating archive $libnamebase for sysroot-prefix tests framework"
+	    perror "Error creating archive $libnamebase for sysroot-prefix tests framework"
 	    return 0
 	}
     }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]