diff options
Diffstat (limited to 'test/Java/JARFLAGS.py')
-rw-r--r-- | test/Java/JARFLAGS.py | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/test/Java/JARFLAGS.py b/test/Java/JARFLAGS.py index 7e3669d..9a846ec 100644 --- a/test/Java/JARFLAGS.py +++ b/test/Java/JARFLAGS.py @@ -32,29 +32,23 @@ test = TestSCons.TestSCons() test.subdir('src') -if test.detect_tool('javac'): - where_javac = test.detect('JAVAC', 'javac') +ENV = test.java_ENV() + +if test.detect_tool('javac', ENV=ENV): + where_javac = test.detect('JAVAC', 'javac', ENV=ENV) else: - import SCons.Environment - env = SCons.Environment.Environment() - where_javac = env.WhereIs('javac', os.environ['PATH']) - if not where_javac: - where_javac = env.WhereIs('javac', '/usr/local/j2sdk1.3.1/bin') - if not where_javac: - print "Could not find Java javac, skipping test(s)." - test.pass_test(1) - -if test.detect_tool('jar'): - where_jar = test.detect('JAR', 'jar') + where_javac = test.where_is('javac') +if not where_javac: + print "Could not find Java javac, skipping test(s)." + test.pass_test(1) + +if test.detect_tool('jar', ENV=ENV): + where_jar = test.detect('JAR', 'jar', ENV=ENV) else: - import SCons.Environment - env = SCons.Environment.Environment() - where_jar = env.WhereIs('jar', os.environ['PATH']) - if not where_jar: - where_jar = env.WhereIs('jar', '/usr/local/j2sdk1.3.1/bin') - if not where_jar: - print "Could not find Java jar, skipping test(s)." - test.pass_test(1) + where_javac = test.where_is('jar') +if not where_jar: + print "Could not find Java jar, skipping test(s)." + test.pass_test(1) test.write('SConstruct', """ env = Environment(tools = ['javac', 'jar'], |