Explicit "skipping test" messages for a few straggling tests.

7 files changed, 16 insertions, 12 deletions

diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py
index 2869d27..4dd8f51 100644
--- a/test/Fortran/F77PATH.py
+++ b/test/Fortran/F77PATH.py
@@ -39,7 +39,7 @@ args = prog + ' ' + variant_prog + ' ' + subdir_prog
 test = TestSCons.TestSCons()
 
 if not test.detect('_F77G', 'g77'):
-    test.skip_test('Found no $F77 tool; skipping test.\n')
+    test.skip_test('Could not find a $F77 tool; skipping test.\n')
     
 test.subdir('include',
             'subdir',
diff --git a/test/Fortran/FORTRANPATH.py b/test/Fortran/FORTRANPATH.py
index 618bea8..20a92d2 100644
--- a/test/Fortran/FORTRANPATH.py
+++ b/test/Fortran/FORTRANPATH.py
@@ -39,7 +39,7 @@ args = prog + ' ' + subdir_prog + ' ' + variant_prog
 test = TestSCons.TestSCons()
 
 if not test.detect('_FORTRANG', 'g77'):
-    test.skip_test('Found no $F77 tool; skipping test.\n')
+    test.skip_test('Could not find a $F77 tool; skipping test.\n')
     
 test.subdir('include',
             'subdir',
diff --git a/test/PharLap.py b/test/PharLap.py
index 9652598..0455cc2 100644
--- a/test/PharLap.py
+++ b/test/PharLap.py
@@ -36,8 +36,11 @@ test = TestSCons.TestSCons()
 if sys.platform != 'win32':
     test.skip_test('PharLap is only available on win32; skipping test.\n')
 
-test.no_result(not test.detect_tool('linkloc'))
-test.no_result(not test.detect_tool('386asm'))
+if not test.detect_tool('linkloc'):
+    test.skip_test("Could not find 'linkloc', skipping test.\n")
+
+if not test.detect_tool('386asm'):
+    test.skip_test("Could not find '386asm', skipping test.\n")
 
 # From the Phar Lap minasm example program...
 test.write("minasm.asm", r"""
diff --git a/test/RANLIB.py b/test/RANLIB.py
index cf4ae78..05edf88 100644
--- a/test/RANLIB.py
+++ b/test/RANLIB.py
@@ -38,7 +38,8 @@ test = TestSCons.TestSCons()
 
 ranlib = test.detect('RANLIB', 'ranlib')
 
-test.no_result(not ranlib)
+if not ranlib:
+    test.skip_test("Could not find 'ranlib', skipping test.\n")
 
 test.write("wrapper.py",
 """import os
diff --git a/test/RANLIBFLAGS.py b/test/RANLIBFLAGS.py
index d6c25a8..377536c 100644
--- a/test/RANLIBFLAGS.py
+++ b/test/RANLIBFLAGS.py
@@ -36,7 +36,8 @@ test = TestSCons.TestSCons()
 
 ranlib = test.detect('RANLIB', 'ranlib')
 
-test.no_result(not ranlib)
+if not ranlib:
+    test.skip_test("Could not find 'ranlib', skipping test.\n")
 
 test.write("wrapper.py",
 """import os
diff --git a/test/RPATH.py b/test/RPATH.py
index 844e407..6ab6eb2 100644
--- a/test/RPATH.py
+++ b/test/RPATH.py
@@ -31,10 +31,9 @@ _exe = TestSCons._exe
 
 test = TestSCons.TestSCons()
 
-if sys.platform == 'cygwin':
-    test.no_result(1)
-elif sys.platform == 'win32':
-    test.no_result(1)
+if sys.platform in ['cygwin', 'win32']:
+    msg = "Can not test RPATH on '%s', skipping test.\n" % sys.platform
+    test.skip_test(msg)
 
 foo = test.workpath('foo' + _exe)
 
diff --git a/test/mingw.py b/test/mingw.py
index d2039b5..ba6add8 100644
--- a/test/mingw.py
+++ b/test/mingw.py
@@ -43,7 +43,7 @@ if sys.platform != 'win32':
     msg = "Skipping mingw test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
-# This test requires MingW to be installed:
+# This test requires MinGW to be installed:
 test.write('SConstruct',"""
 from SCons.Tool.mingw import exists
 import sys
@@ -55,7 +55,7 @@ sys.exit(0)
 
 test.run()
 if string.find(test.stdout(), 'mingw exists') == -1:
-    test.no_result()
+    test.skip_test("No MinGW on this system, skipping test.\n")
 
 test.subdir('header')