diff options
author | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
---|---|---|
committer | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
commit | 358c0de48a7d9fecdb30e24505c066506dfcdeff (patch) | |
tree | e3da370799409e61468868397770eeba5a5fe4bf /test/Java | |
parent | 374acc32ce7ebecbc23dae5859315ddee17e523b (diff) | |
parent | 6cc2ad09d86e6da5812485b0e50a820e2560b31b (diff) | |
download | SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.zip SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.gz SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.bz2 |
Merge in default.
Diffstat (limited to 'test/Java')
-rw-r--r-- | test/Java/JAVAH.py | 7 | ||||
-rw-r--r-- | test/Java/multi-step.py | 7 | ||||
-rw-r--r-- | test/Java/nested-classes.py | 7 |
3 files changed, 19 insertions, 2 deletions
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index f7c9dcc..81582d7 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -93,14 +93,17 @@ line 3 test.must_match('test2.h', "test2.JAVA\nline 3\n") - where_javac, java_version = test.java_where_javac() where_javah = test.java_where_javah() if java_version: java_version = repr(java_version) - +# Skip this test as SCons doesn't (currently) predict the generated +# inner/anonymous class generated .class files generated by gcj +# and so will always fail +if test.javac_is_gcj: + test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n') test.write("wrapper.py", """\ import os diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py index 44ebd31..b43d641 100644 --- a/test/Java/multi-step.py +++ b/test/Java/multi-step.py @@ -44,6 +44,13 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') +# Skip this test as SCons doesn't (currently) predict the generated +# inner/anonymous class generated .class files generated by gcj +# and so will always fail +if test.javac_is_gcj: + test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n') + + test.subdir(['src'], diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py index 2b1b5db..a764054 100644 --- a/test/Java/nested-classes.py +++ b/test/Java/nested-classes.py @@ -40,6 +40,13 @@ where_javac, java_version = test.java_where_javac() # Work around javac 1.4 not reporting its version: java_version = java_version or "1.4" +# Skip this test as SCons doesn't (currently) predict the generated +# inner/anonymous class generated .class files generated by gcj +# and so will always fail +if test.javac_is_gcj: + test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n') + + test.write('SConstruct', """ env = Environment() env['JAVAVERSION'] = '%(java_version)s' |