diff options
Diffstat (limited to 'libjava/testsuite/libjava.lang/test.exp')
| -rw-r--r-- | libjava/testsuite/libjava.lang/test.exp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libjava/testsuite/libjava.lang/test.exp b/libjava/testsuite/libjava.lang/test.exp index cfe9cf5..c0b8570 100644 --- a/libjava/testsuite/libjava.lang/test.exp +++ b/libjava/testsuite/libjava.lang/test.exp @@ -7,12 +7,7 @@ set prefix "" foreach x $srcfiles { regsub "\\.out$" $x "" prefix set bname [file tail $prefix] - set args "" - if [file exists $srcdir/$subdir/${bname}.arg] { - set id [open "$srcdir/$subdir/${bname}.arg" r]; - set args [read -nonewline $id]; - close $id; - } + if [file exists $srcdir/$subdir/${bname}.xpo] { set resfile "$srcdir/$subdir/${bname}.xpo" set options "regexp_match" @@ -27,8 +22,14 @@ foreach x $srcfiles { set inpfile "" } + set args [libjava_read_xfail $srcdir/$subdir/$bname.xfail] + verbose "inpfile is $inpfile" test_libjava $options "${prefix}.java" "" $inpfile $resfile $args test_libjava $options "${prefix}.java" "-O" $inpfile $resfile $args } + +# Local Variables: +# tcl-indent-level:4 +# End: |