merged

4 files changed, 23 insertions, 6 deletions

diff --git a/test/Java/DerivedSourceTest.py b/test/Java/DerivedSourceTest.py
index c749cf3..7f80595 100644
--- a/test/Java/DerivedSourceTest.py
+++ b/test/Java/DerivedSourceTest.py
@@ -45,14 +45,14 @@ SCons.Defaults.DefaultEnvironment(tools = [])
 
 test = TestSCons.TestSCons()
 
-# No result if tools not available
-test.no_result( condition=(test.where_is( 'javac' ) is None) )
-test.no_result( condition=(test.where_is( 'jar' ) is None) )
-
 # This test is known to fail as of July 2014; see Tigris issue 1771 and issue 2931.
 # Once the underlying issue is corrected, this test should be re-enabled.
 test.skip_test('Skipping derived-source test until issue 1771 is fixed.\n')
 
+# No result if tools not available
+test.no_result( condition=(test.where_is( 'javac' ) is None) )
+test.no_result( condition=(test.where_is( 'jar' ) is None) )
+
 test.write(
     ['Sample.java'],
 """
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'