From ab55d1a098571a559bf75031e1c3e7c914afadd7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 22 Dec 2016 12:07:31 +1030 Subject: [PATCH] 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. --- 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 1ae44351127..e879be469a2 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-12-22 Alan Modra + + * 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 * 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 47d065772be..8c244713462 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 } } -- 2.30.2