Update more tests to use the new skip_test() method. Replace a CHANGES.txt comment inadvertently deleted.

4 files changed, 9 insertions, 18 deletions

diff --git a/test/RCS/diskcheck.py b/test/RCS/diskcheck.py
index c1d5cca..4a93edf 100644
--- a/test/RCS/diskcheck.py
+++ b/test/RCS/diskcheck.py
@@ -36,13 +36,11 @@ test = TestSCons.TestSCons()
 
 rcs = test.where_is('rcs')
 if not rcs:
-    print "Could not find RCS, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'rcs'; skipping test(s).\n")
 
 ci = test.where_is('ci')
 if not ci:
-    print "Could not find `ci' command, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'ci'; skipping test(s).\n")
 
 
 
diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py
index 39ea834..d3d5d87 100644
--- a/test/RCS/explicit.py
+++ b/test/RCS/explicit.py
@@ -36,13 +36,11 @@ test = TestSCons.TestSCons()
 
 rcs = test.where_is('rcs')
 if not rcs:
-    print "Could not find RCS, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'rcs'; skipping test(s).\n")
 
 ci = test.where_is('ci')
 if not ci:
-    print "Could not find `ci' command, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find `ci' command, skipping test(s).\n")
 
 
 
diff --git a/test/RCS/implicit.py b/test/RCS/implicit.py
index 2289258..362f15a 100644
--- a/test/RCS/implicit.py
+++ b/test/RCS/implicit.py
@@ -34,18 +34,15 @@ test = TestSCons.TestSCons()
 
 rcs = test.where_is('rcs')
 if not rcs:
-    print "Could not find RCS, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'rcs'; skipping test(s).\n")
 
 ci = test.where_is('ci')
 if not ci:
-    print "Could not find `ci' command, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'ci'; skipping test(s).\n")
 
 co = test.where_is('co')
 if not co:
-    print "Could not find `co' command, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'co'; skipping test(s).\n")
 
 
 
diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py
index 63475c8..28dc558 100644
--- a/test/RCS/transparent.py
+++ b/test/RCS/transparent.py
@@ -36,13 +36,11 @@ test = TestSCons.TestSCons()
 
 rcs = test.where_is('rcs')
 if not rcs:
-    print "Could not find RCS, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'rcs'; skipping test(s).\n")
 
 ci = test.where_is('ci')
 if not ci:
-    print "Could not find `ci' command, skipping test(s)."
-    test.pass_test(1)
+    test.skip_test("Could not find 'ci'; skipping test(s).\n")