summaryrefslogtreecommitdiff
path: root/test/Repository
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-08-13 05:42:18 +0000
committerSteven Knight <knight@baldmt.com>2005-08-13 05:42:18 +0000
commit52fcda2435759339de636e5d5abad71b0f5372ad (patch)
tree7b99184d14e042b4f58b1f2186cbf70f4f05cfc8 /test/Repository
parent90376f36df71401df8e7cf71fead9b7869153159 (diff)
downloadscons-52fcda2435759339de636e5d5abad71b0f5372ad.tar.gz
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.
Diffstat (limited to 'test/Repository')
-rw-r--r--test/Repository/Java.py3
-rw-r--r--test/Repository/JavaH.py6
-rw-r--r--test/Repository/RMIC.py6
3 files changed, 5 insertions, 10 deletions
diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index fd2986e6..6a45dffd 100644
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -41,8 +41,7 @@ java = '/usr/local/j2sdk1.3.1/bin/java'
javac = '/usr/local/j2sdk1.3.1/bin/javac'
if not os.path.exists(javac):
- print "Could not find Java, skipping test(s)."
- test.pass_test(1)
+ test.skip_test("Could not find Java, skipping test(s).\n")
###############################################################################
diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py
index c11ad2b4..0420ca37 100644
--- a/test/Repository/JavaH.py
+++ b/test/Repository/JavaH.py
@@ -42,12 +42,10 @@ javac = '/usr/local/j2sdk1.3.1/bin/javac'
javah = '/usr/local/j2sdk1.3.1/bin/javah'
if not os.path.exists(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 not os.path.exists(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")
###############################################################################
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index 9282835d..011006d7 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -42,12 +42,10 @@ javac = '/usr/local/j2sdk1.3.1/bin/javac'
rmic = '/usr/local/j2sdk1.3.1/bin/rmic'
if not os.path.exists(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 not os.path.exists(rmic):
- print "Could not find Java (rmic), skipping test(s)."
- test.pass_test(1)
+ test.skip_test("Could not find Java (rmic), skipping test(s).\n")
###############################################################################