Merged revisions 2647-2719 via svnmerge from

[scons.git] / test / Repository / Java.py

diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index 67ef605d2be98c5aeb0e23e92d1d428db54320ff..e9644563cb6286ddc99853b8fe270ae5b160d14f 100644 (file)
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -40,6 +40,10 @@ test = TestSCons.TestSCons()
 where_javac, java_version = test.java_where_javac()
 where_java = test.java_where_java()
 
+# where_java_home=test.java_where_java_home()
+os.environ['JAVA_HOME'] = test.java_where_java_home()
+
+
 
 java = where_java
 javac = where_javac
@@ -105,7 +109,6 @@ test.writable('repository', 0)
 #
 test.run(chdir = 'work1', options = opts, arguments = ".")
 
-os.environ['JAVA_HOME'] = '/usr/lib/jvm/java-1.5.0-sun-1.5.0.11'
 
 test.run(program = java,
          arguments = "-cp %s Foo1" % work1_classes,