diff options
| author | Tom Tromey <tromey@redhat.com> | 2000-12-16 19:02:54 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-12-16 19:02:54 +0000 |
| commit | 68c7dea8eda115ed3056df1f127e0fcd7f43a443 (patch) | |
| tree | b49c7e68a96cfbcd7b79d484314e0561680cbf08 /libjava/testsuite/lib | |
| parent | 2bed3391384aef335885b8271a085e1c18f3d0f1 (diff) | |
| download | gcc-68c7dea8eda115ed3056df1f127e0fcd7f43a443.zip gcc-68c7dea8eda115ed3056df1f127e0fcd7f43a443.tar.gz gcc-68c7dea8eda115ed3056df1f127e0fcd7f43a443.tar.bz2 | |
libjava.exp (test_libjava_from_javac): Strange quoting trick for `.class' link case.
* lib/libjava.exp (test_libjava_from_javac): Strange quoting trick
for `.class' link case.
(bytecompile_file): Change directory outside of `catch'.
* libjava.lang/Thread_1.java: Removed.
* libjava.lang/Thread_1.out: Likewise.
* libjava.lang/N19990310_4.xfail: New file.
* libjava.lang/stub.xfail: Added new failure modes.
* libjava.lang/stringconst.xfail: New file.
* libjava.lang/PR162.xfail: New file.
* libjava.lang/Final.xfail: Removed.
From-SVN: r38311
Diffstat (limited to 'libjava/testsuite/lib')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index e6b3744..085fdc2 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -18,8 +18,6 @@ proc libjava_tcompile {source destfile type options} { # This strange-looking expression really does quote the `$'. regsub -all -- {\$} $source {\$} source regsub -all -- {\$} $destfile {\$} destfile - verbose "Now source = $source" - verbose "Now destfile = $destfile" return [target_compile $source $destfile $type $options] } @@ -88,19 +86,17 @@ proc bytecompile_file { file objdir {classpath {}} } { if {$classpath != ""} then { set env(CLASSPATH) $classpath } + set here [pwd] + cd $dirname if {[catch { - set here [pwd] - cd $dirname set q [eval exec "$javac [list $file] -d $objdir 2>@ stdout"] - cd $here - # "return" a result - set q $q } msg]} then { verbose "couldn't compile $file: $msg" set r 0 } else { set r 1 } + cd $here return $r } @@ -581,8 +577,15 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e } } } else { + # This is no evil: we de-listify CLASS_FILES so that we can + # turn around and quote the `$' in it for the shell. I really + # hate DejaGNU. It is so !@#$!@# unpredictable. + set hack "" + foreach stupid $class_files { + set hack "$hack $stupid" + } set x [prune_warnings \ - [libjava_tcompile $class_files "$executable" $type $args]] + [libjava_tcompile $hack "$executable" $type $args]] } if {[info exists opts(xfail-byte)]} { setup_xfail *-*-* |