# options and only worry about processing the one we want.
set opt_array [slurp_options "${file}"]
if { $opt_array == -1 } {
- unresolved $name
return
}
set opt_machs [lindex $i 1]
set opt_val [lindex $i 2]
if ![info exists opts($opt_name)] {
- perror "unknown option $opt_name in file $file"
- unresolved $name
+ unresolved "$file - unknown option $opt_name"
return
}
foreach m $opt_machs {
# A configuration file must be specified, so make sure we have one.
if { $opts(configfile) == "" && $cfile == ""} {
- perror "A sid configuration file must be specified."
+ unresolved "$file - no sid configuration file specified."
return
}
set opt_array [slurp_options "${file}"]
if { $opt_array == -1 } {
- unresolved $name
return
}
set opts(as) {}
set opt_machs [lindex $i 1]
set opt_val [lindex $i 2]
if ![info exists opts($opt_name)] {
- perror "unknown option $opt_name in file $file"
- unresolved $name
+ unresolved "$name - unknown option $opt_name"
return
}
foreach m $opt_machs {
if ![string match "" $comp_output] {
verbose -log "$comp_output" 3
- perror "$mach $testname - compile failed"
+ untested "$mach $testname - compile failed"
continue
}
} else {
if ![string match "" $comp_output] {
verbose -log "$comp_output" 3
- perror "$mach $testname - assembly failed"
+ untested "$mach $testname - assembly failed"
continue
}
if ![string match "" $comp_output] {
verbose -log "$comp_output" 3
- perror "$mach $testname - linking failed"
+ untested "$mach $testname - linking failed"
continue
}
}
if { "$status" == "pass" } {
if { "$opts(xerror)" == "no" } {
if [string match $opts(output) $output] {
- pass $test
+ pass "$test \#$iter"
} else {
verbose -log "output: $output" 3
verbose -log "pattern: $opts(output)" 3
- fail "$mach $testname"
+ fail "$mach $testname \#$iter"
return
}
} else {
verbose -log "`pass' return code when expecting failure" 3
- fail $test
+ fail "$test \#$iter"
return
}
} elseif { "$status" == "fail" } {
if { "$opts(xerror)" == "no" } {
- fail "$mach $testname"
+ fail "$mach $testname \#$iter"
return
} else {
if [string match $opts(output) $output] {
- pass $test
+ pass "$test \#$iter"
} else {
verbose -log "output: $output" 3
verbose -log "pattern: $opts(output)" 3
- fail $test
+ fail "$test \#$iter"
return
}
}
} else {
- $status "$mach $testname"
+ $status "$mach $testname \#$iter"
}
}
if {$sid_run_repetitions > 1} then {
if [is_remote host] {
# Let's make this a catastrophic error so should the time ever come
# for it's need, the problem stands out.
- error "remote host operation isn't supported"
+ unsupported "remote host operation isn't supported"
}
# FIXME: this works for UNIX only
#verbose "Slurping $file"
if [catch { set f [open $file r] } x] {
#perror "couldn't open `$file': $x"
- perror "$x"
+ untested "$x"
return -1
}
set opt_array {}