From a973b63aea0536805bdf89d89cd59d63b1cb0aea Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 16 Mar 2008 18:20:24 +0000 Subject: [PATCH] Just find java in the path. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@448 ed5b42cb-e716-0410-a449-f6a68f950b19 --- tests/bin/runjava | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/tests/bin/runjava b/tests/bin/runjava index 41e5eb27..d589ffae 100755 --- a/tests/bin/runjava +++ b/tests/bin/runjava @@ -16,26 +16,7 @@ my $root = join("/", @parts); $realroot = $root; $root = "$root/.."; -# make sure JAVA_HOME is set -my $jhome = $ENV{"JAVA_HOME"}; -if (!defined $jhome) { - warn "$0: Error: No JAVA_HOME specified!\n"; - warn "\n"; - warn "You must set your JAVA_HOME environment variable to the\n"; - warn "the absolute path of your JDK installation. For example:\n"; - warn "\n"; - warn " % JAVA_HOME=/usr/local/jdk1.2\n"; - warn " % export JAVA_HOME\n"; - die "\n"; -} - -# make sure it's set to a directory -if (! -d $jhome) { - die "$0: Can't find a java interpreter in '$jhome'.\n"; -} - -my $java = "$jhome/bin/java"; -my $jlib = "$jhome/lib/classes.zip"; +my $java = "java"; # determine our machine architecture my $ostype = `uname -s`; @@ -73,7 +54,7 @@ foreach $dir (@dirs) { } # finally add the standard classes -$classpath = "$classpath:$jlib"; +$classpath = "$classpath"; # specify our server root (this is for server code) my $rootarg = "-Dresource_dir=$realroot/rsrc -Dtest_dir=$realroot";