From 0d9cd062a095fa004363dccaceda82c806e966f9 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Mon, 4 Oct 1999 03:30:54 +0000 Subject: A little clean up. From-SVN: r29790 --- libjava/testsuite/libjava.lang/lang.exp | 35 +++++++++++++++++++++++++++++++++ libjava/testsuite/libjava.lang/test.exp | 35 --------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 libjava/testsuite/libjava.lang/lang.exp delete mode 100644 libjava/testsuite/libjava.lang/test.exp (limited to 'libjava/testsuite/libjava.lang') diff --git a/libjava/testsuite/libjava.lang/lang.exp b/libjava/testsuite/libjava.lang/lang.exp new file mode 100644 index 0000000..c0b8570 --- /dev/null +++ b/libjava/testsuite/libjava.lang/lang.exp @@ -0,0 +1,35 @@ +global srcdir subdir + +catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles +verbose "srcfiles are $srcfiles" + +set prefix "" +foreach x $srcfiles { + regsub "\\.out$" $x "" prefix + set bname [file tail $prefix] + + if [file exists $srcdir/$subdir/${bname}.xpo] { + set resfile "$srcdir/$subdir/${bname}.xpo" + set options "regexp_match" + } else { + set resfile "${prefix}.out" + set options "" + } + + if [file exists ${prefix}.inp] { + set inpfile ${prefix}.inp + } else { + 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: diff --git a/libjava/testsuite/libjava.lang/test.exp b/libjava/testsuite/libjava.lang/test.exp deleted file mode 100644 index c0b8570..0000000 --- a/libjava/testsuite/libjava.lang/test.exp +++ /dev/null @@ -1,35 +0,0 @@ -global srcdir subdir - -catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles -verbose "srcfiles are $srcfiles" - -set prefix "" -foreach x $srcfiles { - regsub "\\.out$" $x "" prefix - set bname [file tail $prefix] - - if [file exists $srcdir/$subdir/${bname}.xpo] { - set resfile "$srcdir/$subdir/${bname}.xpo" - set options "regexp_match" - } else { - set resfile "${prefix}.out" - set options "" - } - - if [file exists ${prefix}.inp] { - set inpfile ${prefix}.inp - } else { - 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: -- cgit v1.1