diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-11-01 20:06:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 20:06:32 (GMT) |
| commit | 1a04e66fdbe9dd5b088c337fa04f66f403dde2ad (patch) | |
| tree | 248b1056793aef62a1193691cc389a36ae9a7c7c /test/Java/source-files.py | |
| parent | 86e06a8a2cdbd487e685bb51b64979fadbcd5694 (diff) | |
| parent | 5c0d91c3a38effd1ce4305e71168ea9e924437cb (diff) | |
| download | SCons-1a04e66fdbe9dd5b088c337fa04f66f403dde2ad.zip SCons-1a04e66fdbe9dd5b088c337fa04f66f403dde2ad.tar.gz SCons-1a04e66fdbe9dd5b088c337fa04f66f403dde2ad.tar.bz2 | |
Merge pull request #4046 from mwichmann/java-tests
Skip unusable javah tests
Diffstat (limited to 'test/Java/source-files.py')
| -rw-r--r-- | test/Java/source-files.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/test/Java/source-files.py b/test/Java/source-files.py index e5cb8b6..23e5ebc 100644 --- a/test/Java/source-files.py +++ b/test/Java/source-files.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -# __COPYRIGHT__ +# MIT License +# +# Copyright The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -20,9 +22,6 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ Verify that we can pass the Java() builder explicit lists of .java @@ -31,8 +30,6 @@ files as sources. import TestSCons -_python_ = TestSCons._python_ - test = TestSCons.TestSCons() # Keep this logic because it skips the test if javac or jar not found. @@ -40,10 +37,10 @@ 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') -env.Java(target = 'class2', source = ['com/Example2.java', 'com/Example3.java']) -""" % locals()) +env = Environment(tools=['javac']) +env.Java(target='class1', source='com/Example1.java') +env.Java(target='class2', source=['com/Example2.java', 'com/Example3.java']) +""") test.subdir('com', 'src') |