diff options
author | William Deegan <bill@baddogconsulting.com> | 2016-01-17 14:02:32 -0800 |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2016-01-17 14:02:32 -0800 |
commit | 85f0d35fa2bccdf2a9b301c4e944f862ad934a36 (patch) | |
tree | bfc61a737c90e8aad39f42348b9c8bb3ef227138 /test/Java | |
parent | 32aaeefb59c6157b1bba999bb0dd821cc09e170b (diff) | |
download | scons-85f0d35fa2bccdf2a9b301c4e944f862ad934a36.tar.gz |
changes to skip tests on ubuntu-next when gcj and not real java, and also when no latex is available
Diffstat (limited to 'test/Java')
-rw-r--r-- | test/Java/JAVAH.py | 4 | ||||
-rw-r--r-- | test/Java/multi-step.py | 4 | ||||
-rw-r--r-- | test/Java/nested-classes.py | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index f7c9dcc0..df0ec2d2 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -93,14 +93,14 @@ 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) - +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 a8efcd46..46758950 100644 --- a/test/Java/multi-step.py +++ b/test/Java/multi-step.py @@ -43,6 +43,10 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') +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 2b1b5db0..81261577 100644 --- a/test/Java/nested-classes.py +++ b/test/Java/nested-classes.py @@ -40,6 +40,10 @@ where_javac, java_version = test.java_where_javac() # Work around javac 1.4 not reporting its version: java_version = java_version or "1.4" +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' |