diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-11-01 19:32:21 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-11-01 19:32:21 +0000 |
| commit | 0e75523eb4e5b6de0ba5557122653ba6d1c7e2b9 (patch) | |
| tree | 5a53bd54e4084ff9f301fcc5f421e7659e2bc3b2 /libjava/testsuite/libjava.mauve/mauve.exp | |
| parent | 23ae3eb1f89fe1b75e9d4e2311d95d7bebba52fb (diff) | |
| download | gcc-0e75523eb4e5b6de0ba5557122653ba6d1c7e2b9.zip gcc-0e75523eb4e5b6de0ba5557122653ba6d1c7e2b9.tar.gz gcc-0e75523eb4e5b6de0ba5557122653ba6d1c7e2b9.tar.bz2 | |
mauve.exp (find_mauve_sources): New proc.
* libjava.mauve/mauve.exp (find_mauve_sources): New proc.
(test_mauve): Use it.
(test_mauve_sim): Likewise.
From-SVN: r58725
Diffstat (limited to 'libjava/testsuite/libjava.mauve/mauve.exp')
| -rw-r--r-- | libjava/testsuite/libjava.mauve/mauve.exp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index 4a26b27..a9a1c98 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -52,12 +52,27 @@ proc mauve_compute_uses {aName} { return [lsort [array names uses]] } +# Find Mauve sources. At end, env(MAUVEDIR) points to sources. +# Returns 0 if sources not found, 1 otherwise. +proc find_mauve_sources {} { + global env srcdir + + if {[info exists env(MAUVEDIR)]} { + return 1 + } elseif {[file isdirectory $srcdir/libjava.mauve/mauve]} { + set env(MAUVEDIR) $srcdir/libjava.mauve/mauve + return 1 + } + + return 0 +} + # Run all the Mauve tests. Return 1 on success, 0 on any failure. If # the tests are skipped, that is treated like success. proc test_mauve {} { global srcdir objdir subdir env - if {! [info exists env(MAUVEDIR)]} then { + if {! [find_mauve_sources]} then { verbose "MAUVEDIR not set; not running Mauve tests" return 1 } @@ -220,7 +235,7 @@ proc test_mauve {} { proc test_mauve_sim {} { global srcdir subdir env - if {! [info exists env(MAUVEDIR)]} then { + if {! [find_mauve_sources]} then { verbose "MAUVEDIR not set; not running Mauve tests" return 1 } |