summaryrefslogtreecommitdiff
path: root/test/Java/nested-classes.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-01-17 14:02:32 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2016-01-17 14:02:32 -0800
commit87d2714f989ab8082dc5bd4111c9d5212e81b1a9 (patch)
treebfc61a737c90e8aad39f42348b9c8bb3ef227138 /test/Java/nested-classes.py
parent49bb971fdcb7c54c5044f5854de3c177a6f41d1f (diff)
downloadscons-git-87d2714f989ab8082dc5bd4111c9d5212e81b1a9.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/nested-classes.py')
-rw-r--r--test/Java/nested-classes.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py
index 2b1b5db02..812615773 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'