Change explicit uses of test.no_result() to test.skip_test(),

for consistency with the rest.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3930 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index ce8bd775e94d430dacb72b43531be43bd3a429ad..1aaf4a3bbda5a52dca6da057984378b50b42dd9a 100644 (file)
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -39,7 +39,8 @@ test = TestSCons.TestSCons()
 # Writing this to accomodate both our in-line tool chain and the
 # MSVC command lines is too hard, and will be completely unnecessary
 # some day when we separate our tests.  Punt for now.
-test.no_result(sys.platform == 'win32')
+if sys.platform == 'win32':
+    test.skip_test('Skipping on win32.\n')
 
 
 

diff --git a/test/SHELL.py b/test/SHELL.py
index 915dbce79ec89bc9013f920a5bd94d8c9409a82a..b946189b89ca49fa8403e457d2fd94915843d5b7 100644 (file)
--- a/test/SHELL.py
+++ b/test/SHELL.py
@@ -40,8 +40,8 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 if sys.platform == 'win32':
-    sys.stderr.write('Cannot set SHELL separately from other variables on Windows.\n')
-    test.no_result(1)
+    msg = 'Cannot set SHELL separately from other variables on Windows.\n'
+    test.skip_test(msg)
 
 my_shell = test.workpath('my_shell.py')
 

diff --git a/test/symlink/VariantDir.py b/test/symlink/VariantDir.py
index a6dd30be53efe5d482c120abb6441b1bd5213c43..bbde65d3dd042cf8a20d1b2fdea607f8d678fb18 100644 (file)
--- a/test/symlink/VariantDir.py
+++ b/test/symlink/VariantDir.py
@@ -35,8 +35,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 if not hasattr(os, 'symlink'):
-    print "No os.symlink() method, no symlinks to test."
-    test.no_result(1)
+    test.skip_test('No os.symlink() method, no symlinks to test.\n')
 
 test.subdir('obj',
             ['obj', 'subdir'],

diff --git a/test/symlink/dangling-include.py b/test/symlink/dangling-include.py
index 9c9d93a1f3b69b51f7ae5fdabee5aa17e792b911..97026d5e50145a3300e39fa66314730fefc15a12 100644 (file)
--- a/test/symlink/dangling-include.py
+++ b/test/symlink/dangling-include.py
@@ -35,8 +35,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 if not hasattr(os, 'symlink'):
-    print "No os.symlink() method, no symlinks to test."
-    test.no_result(1)
+    test.skip_test('No os.symlink() method, no symlinks to test.\n')
 
 foo_obj = 'foo' + TestSCons._obj
 

diff --git a/test/symlink/dangling-source.py b/test/symlink/dangling-source.py
index 366b7426c159e57a8c5868aa09e0394049f2a011..33ad66148f5ee7d3040836f3565638ab2810fd1a 100644 (file)
--- a/test/symlink/dangling-source.py
+++ b/test/symlink/dangling-source.py
@@ -35,8 +35,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 if not hasattr(os, 'symlink'):
-    print "No os.symlink() method, no symlinks to test."
-    test.no_result(1)
+    test.skip_test('No os.symlink() method, no symlinks to test.\n')
 
 test.write('SConstruct', """
 Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))