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.

5 files changed, 8 insertions, 16 deletions

diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 42f2c5a..f0e3b3a 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -126,16 +126,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_jar = 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("wrapper.py", """\
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'],
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index a89ed52..dd09e35 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -99,8 +99,7 @@ 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")
 
 
 
diff --git a/test/Java/JAVACFLAGS.py b/test/Java/JAVACFLAGS.py
index d0ab847..a237e91 100644
--- a/test/Java/JAVACFLAGS.py
+++ b/test/Java/JAVACFLAGS.py
@@ -37,8 +37,7 @@ 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")
 
 test.subdir('src')
 
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index b70fde0..f9a052e 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -103,8 +103,7 @@ else:
     if not where_javac:
         where_javac = env.WhereIs('javac', '/usr/local/j2sdk1.3.1/bin')
         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('javah'):
     where_javah = test.detect('JAVAH', 'javah')
@@ -115,8 +114,7 @@ else:
     if not where_javah:
         where_javah = env.WhereIs('javah', '/usr/local/j2sdk1.3.1/bin')
         if not where_javah:
-            print "Could not find Java javah, skipping test(s)."
-            test.pass_test(1)
+            test.skip_test("Could not find Java javah, skipping test(s).\n")