From 71104ab7b95596d32d791f40d77a2036e1eedad6 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Thu, 29 Jan 2009 17:06:24 +0000 Subject: [PATCH] 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 --- test/CPPFLAGS.py | 3 ++- test/SHELL.py | 4 ++-- test/symlink/VariantDir.py | 3 +-- test/symlink/dangling-include.py | 3 +-- test/symlink/dangling-source.py | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py index ce8bd775..1aaf4a3b 100644 --- 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 915dbce7..b946189b 100644 --- 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 a6dd30be..bbde65d3 100644 --- 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 9c9d93a1..97026d5e 100644 --- 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 366b7426..33ad6614 100644 --- 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')) -- 2.26.2