summaryrefslogtreecommitdiffstats
path: root/test/Java/JAVAH.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-01-17 22:02:32 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-01-17 22:02:32 (GMT)
commit87d2714f989ab8082dc5bd4111c9d5212e81b1a9 (patch)
treebfc61a737c90e8aad39f42348b9c8bb3ef227138 /test/Java/JAVAH.py
parent49bb971fdcb7c54c5044f5854de3c177a6f41d1f (diff)
downloadSCons-87d2714f989ab8082dc5bd4111c9d5212e81b1a9.zip
SCons-87d2714f989ab8082dc5bd4111c9d5212e81b1a9.tar.gz
SCons-87d2714f989ab8082dc5bd4111c9d5212e81b1a9.tar.bz2
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/JAVAH.py')
-rw-r--r--test/Java/JAVAH.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index f7c9dcc..df0ec2d 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