diff options
| -rw-r--r-- | newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | newlib/testsuite/lib/checkoutput.exp | 9 | ||||
| -rw-r--r-- | newlib/testsuite/lib/passfail.exp | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 4f9193c..c6f9f23 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2005-07-18 Joseph S. Myers <joseph@codesourcery.com> + + * testsuite/lib/checkoutput.exp (newlib_check_output): Use test + names after PASS and FAIL which do not depend on source directory + name or on whether test passed or failed. + * testsuite/lib/passfail.exp (newlib_pass_fail): Likewise. + 2005-07-08 Ola Hugosson <Ola.Hugosson@anoto.com> * libc/string/wcsspn.c (wcsspn): Add missing increment of q. diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp index 4bf7438..146f87b 100644 --- a/newlib/testsuite/lib/checkoutput.exp +++ b/newlib/testsuite/lib/checkoutput.exp @@ -17,9 +17,11 @@ proc newlib_check_output { srcfile expectlist } { set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""] if { $comp_output != "" } { - fail "Failed to compile $srcfile.\n" + fail "$subdir/$srcfile compilation" + unresolved "$subdir/$srcfile output" return } + pass "$subdir/$srcfile compilation" set result [newlib_load $test_driver ""] set status [lindex $result 0] @@ -30,11 +32,12 @@ proc newlib_check_output { srcfile expectlist } { foreach { expectedval } $expectlist { set gotval [string trim [lindex $output_lines 0] "\r"] if { ! [string match $expectedval $gotval] } { - fail "$srcfile: Expected: $expectedval Got: $gotval " + verbose -log "$subdir/$srcfile: Expected: $expectedval Got: $gotval " + fail "$subdir/$srcfile output" return } set output_lines [lrange $output_lines 1 end] } - pass $srcfile + pass "$subdir/$srcfile output" } diff --git a/newlib/testsuite/lib/passfail.exp b/newlib/testsuite/lib/passfail.exp index 3532c8b..5e7eb21 100644 --- a/newlib/testsuite/lib/passfail.exp +++ b/newlib/testsuite/lib/passfail.exp @@ -41,10 +41,12 @@ proc newlib_pass_fail { srcfile } { set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""] if { $comp_output != "" } { - fail "Failed to compile $fullsrcfile.\n" + fail "$subdir/$srcfile compilation" + unresolved "$subdir/$srcfile execution" } else { + pass "$subdir/$srcfile compilation" set result [newlib_load $test_driver ""] set status [lindex $result 0] - $status "$fullsrcfile" + $status "$subdir/$srcfile execution" } } |