summaryrefslogtreecommitdiffstats
path: root/test/Java/source-files.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-11-02 02:50:18 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-11-02 02:50:18 (GMT)
commit1d667e1bb42f0e3656860eaa4b35a35f357a329a (patch)
tree99e3324816625c8d198a4e1d577596fe85e95c06 /test/Java/source-files.py
parent50bdeb4f4c3bf148c242b93f1a517a11758a2d9c (diff)
parent03be89c25fd6e6b4e8f9cddd41e8b5fbc3ed7c1f (diff)
downloadSCons-1d667e1bb42f0e3656860eaa4b35a35f357a329a.zip
SCons-1d667e1bb42f0e3656860eaa4b35a35f357a329a.tar.gz
SCons-1d667e1bb42f0e3656860eaa4b35a35f357a329a.tar.bz2
Merge remote-tracking branch 'upstream/master' into fix_win_m4
Diffstat (limited to 'test/Java/source-files.py')
-rw-r--r--test/Java/source-files.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Java/source-files.py b/test/Java/source-files.py
index ab395a0..e5cb8b6 100644
--- a/test/Java/source-files.py
+++ b/test/Java/source-files.py
@@ -35,6 +35,10 @@ _python_ = TestSCons._python_
test = TestSCons.TestSCons()
+# Keep this logic because it skips the test if javac or jar not found.
+where_javac, java_version = test.java_where_javac()
+where_jar = test.java_where_jar()
+
test.write('SConstruct', """
env = Environment(tools = ['javac', 'javah'])
env.Java(target = 'class1', source = 'com/Example1.java')