Add a skip_test() method to the infrastructure and use it for test scripts that skip all or part of their tests based on tool availability or test platform.

1 files changed, 2 insertions, 4 deletions

diff --git a/test/Java/JARFLAGS.py b/test/Java/JARFLAGS.py
index 9a846ec..64eb1a4 100644
--- a/test/Java/JARFLAGS.py
+++ b/test/Java/JARFLAGS.py
@@ -39,16 +39,14 @@ if test.detect_tool('javac', ENV=ENV):
 else:
     where_javac = test.where_is('javac')
 if not where_javac:
-    print "Could not find Java javac, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find Java javac, skipping test(s).\n")
 
 if test.detect_tool('jar', ENV=ENV):
     where_jar = test.detect('JAR', 'jar', ENV=ENV)
 else:
     where_javac = test.where_is('jar')
 if not where_jar:
-    print "Could not find Java jar, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find Java jar, skipping test(s).\n")
 
 test.write('SConstruct', """
 env = Environment(tools = ['javac', 'jar'],