summaryrefslogtreecommitdiffstats
path: root/test/Java/JAVASOURCEPATH.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/Java/JAVASOURCEPATH.py')
-rw-r--r--test/Java/JAVASOURCEPATH.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/test/Java/JAVASOURCEPATH.py b/test/Java/JAVASOURCEPATH.py
index 069e228..87e90ad 100644
--- a/test/Java/JAVASOURCEPATH.py
+++ b/test/Java/JAVASOURCEPATH.py
@@ -36,14 +36,7 @@ _python_ = TestSCons._python_
test = TestSCons.TestSCons()
-ENV = test.java_ENV()
-
-if test.detect_tool('javac', ENV=ENV):
- where_javac = test.detect('JAVAC', 'javac', ENV=ENV)
-else:
- where_javac = test.where_is('javac')
-if not where_javac:
- test.skip_test("Could not find Java javac, skipping test(s).\n")
+where_javac, java_version = test.java_where_javac()
test.write('SConstruct', """
env = Environment(tools = ['javac', 'javah'],