diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-31 23:52:52 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-31 23:52:52 +0000 |
| commit | fcb013864b11e541adbf9456e57be40eb9dcf664 (patch) | |
| tree | ae71ef2ab48ebcd8f0b335d3c39d72757df87681 /libjava/testsuite/libjava.mauve/mauve.exp | |
| parent | 14725081007775da1dbfea5cd55ea8e870ff81e6 (diff) | |
| download | gcc-fcb013864b11e541adbf9456e57be40eb9dcf664.tar.gz | |
1999-07-31 Alexandre Oliva <oliva@dcc.unicamp.br>
* lib/libjava.exp (bytecompile_file): Use `env(SUN_JAVAC)', that
defaults to javac, as Sun-javac compiler or compatible.
(libjava_init): Get GCJ from environment if neither GCJ_UNDER_TEST
nor TOOL_EXECUTABLE are set. Set `original_ld_library_path' from
environment.
(libjava_arguments): Prepend `.' and `$srcdir/$subdir' to
CLASSPATH, for `support' sources. Search for libgcj.spec in
`$objdir/..', by adding -B to GCJ_UNDER_TEST. Append
original_ld_library_path to ld_library_path.
* libjava.mauve/mauve.exp (test_mauve): Set `env(GCJ)' from
GCJ_UNDER_TEST, calculated just like in libjava.exp.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28364 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/libjava.mauve/mauve.exp')
| -rw-r--r-- | libjava/testsuite/libjava.mauve/mauve.exp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index 0b49bb872aa..398b6704c84 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -49,7 +49,7 @@ proc mauve_compute_uses {aName} { # Run all the Mauve tests. proc test_mauve {} { - global srcdir subdir env + global srcdir objdir subdir env if {! [info exists env(MAUVEDIR)]} then { verbose "MAUVEDIR not set; not running Mauve tests" @@ -65,6 +65,26 @@ proc test_mauve {} { set full_srcdir [pwd] cd $here/mauve-build + global env + global GCJ_UNDER_TEST + global TOOL_EXECUTABLE + + if ![info exists GCJ_UNDER_TEST] { + if [info exists TOOL_EXECUTABLE] { + set GCJ_UNDER_TEST $TOOL_EXECUTABLE; + } else { + if [info exists env(GCJ)] { + set GCJ_UNDER_TEST env(GCJ) + } else { + set GCJ_UNDER_TEST "[find_gcj]" + } + } + } + + # Append -B and -I so that libgcj.spec and libgcj.zip are found + # before they're installed. + set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.zip" + if {[catch {system "$env(MAUVEDIR)/configure --with-gcj"} msg]} then { fail "Mauve configure" verbose "configure failed with $msg" |