JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* testsuite/lib/checkoutput.exp (newlib_check_output): Output

Browse Source 
only one pass or fail per test file.  Trim \r's from output
	values received from test programs.  Remove support for named
	tests.
	* testsuite/newlib.locale/UTF-8.exp: Update to support new
	newlib_check_output behaviour.
	* testsuite/newlib.locale/UTF-8.c: Likewise.
This commit is contained in:
Thomas Fitzsimmons
2002-05-15 23:48:47 +00:00
parent dc824ef736
commit 3495f076f3
3 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
newlib/testsuite/lib/checkoutput.exp
View File

@ -5,9 +5,8 @@
#
# newlib_check_output takes the basename of the test source file, and
# a list of pairs of the form "testname" "expectedoutput"
# "testname" "expectedoutput"... It assumes one line of output
# per test.
# a list of TCL regular expressions representing the expected output.
# It assumes one line of output per test.
proc newlib_check_output { srcfile expectlist } {
global objdir subdir srcdir
@ -19,8 +18,7 @@ proc newlib_check_output { srcfile expectlist } {
if { $comp_output != "" } {
fail "Failed to compile $srcfile.\n"
} else {
pass "Compiled $srcfile.\n"
return
}
set result [newlib_load $test_driver ""]
@ -29,12 +27,14 @@ proc newlib_check_output { srcfile expectlist } {
set output_lines [split $output "\n"]
foreach { testname expectedval } $expectlist {
if [string match "$expectedval" "[lindex $output_lines 0]"] then {
pass $testname
} else {
fail $testname
foreach { expectedval } $expectlist {
set gotval [string trim [lindex $output_lines 0] "\r"]
if { ! [string match $expectedval $gotval] } {
fail "$srcfile: Expected: $expectedval Got: $gotval "
return
}
set output_lines [lrange $output_lines 1 end]
}
pass $srcfile
}