diff options
author | Steven Knight <knight@baldmt.com> | 2005-04-26 04:14:40 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2005-04-26 04:14:40 (GMT) |
commit | 5673cd1804e24700a0216bda0f426afeb678881a (patch) | |
tree | 4469aa200175c39f9d91eb1f655997a2aa87ced5 /test | |
parent | 561e09d2d6cbda130f2af848b6ff22da1694c5e7 (diff) | |
download | SCons-5673cd1804e24700a0216bda0f426afeb678881a.zip SCons-5673cd1804e24700a0216bda0f426afeb678881a.tar.gz SCons-5673cd1804e24700a0216bda0f426afeb678881a.tar.bz2 |
More flexible (and Make-like) ignoring command exit status, and suppressing printing of a command.
Diffstat (limited to 'test')
-rw-r--r-- | test/ignore-command.py | 87 | ||||
-rw-r--r-- | test/silent-command.py | 86 |
2 files changed, 173 insertions, 0 deletions
diff --git a/test/ignore-command.py b/test/ignore-command.py new file mode 100644 index 0000000..201c488 --- /dev/null +++ b/test/ignore-command.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002, 2003, 2004 The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +""" +Test use of a preceding - to ignore the return value from a command. +""" + +__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/test/option-n.py 0.96.C352 2005/03/26 00:09:23 knight" + +import os +import os.path +import re +import string +import sys +import TestCmd +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + +test.subdir('build', 'src') + +test.write('build.py', r""" +import sys +fp = open(sys.argv[1], 'wb') +for f in sys.argv[2:]: + fp.write(open(f, 'rb').read()) +fp.close() +sys.exit(1) +""") + +test.write('SConstruct', """\ +env = Environment() +f1 = env.Command('f1.out', 'f1.in', "%(python)s build.py $TARGET $SOURCE") +f2 = env.Command('f2.out', 'f2.in', "-%(python)s build.py $TARGET $SOURCE") +f3 = env.Command('f3.out', 'f3.in', "- %(python)s build.py $TARGET $SOURCE") +f4 = env.Command('f4.out', 'f4.in', "@-%(python)s build.py $TARGET $SOURCE") +f5 = env.Command('f5.out', 'f5.in', "@- %(python)s build.py $TARGET $SOURCE") +f6 = env.Command('f6.out', 'f6.in', "-@%(python)s build.py $TARGET $SOURCE") +f7 = env.Command('f7.out', 'f7.in', "-@ %(python)s build.py $TARGET $SOURCE") +Default(f2, f3, f4, f5, f6, f7) +""" % locals()) + +test.write('f1.in', "f1.in\n") +test.write('f2.in', "f2.in\n") +test.write('f3.in', "f3.in\n") +test.write('f4.in', "f4.in\n") +test.write('f5.in', "f5.in\n") +test.write('f6.in', "f6.in\n") +test.write('f7.in', "f7.in\n") + +test.run() + +test.must_match('f2.out', "f2.in\n") +test.must_match('f3.out', "f3.in\n") +test.must_match('f4.out', "f4.in\n") +test.must_match('f5.out', "f5.in\n") +test.must_match('f6.out', "f6.in\n") +test.must_match('f7.out', "f7.in\n") + +test.run(arguments='.', status=2, stderr=None) + +test.must_match('f1.out', "f1.in\n") + +test.pass_test() diff --git a/test/silent-command.py b/test/silent-command.py new file mode 100644 index 0000000..a5da7a8 --- /dev/null +++ b/test/silent-command.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002, 2003, 2004 The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +""" +Test the use of a preceding @ to suppress printing a command. +""" + +__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/test/option-n.py 0.96.C352 2005/03/26 00:09:23 knight" + +import os +import os.path +import re +import string +import sys +import TestCmd +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + +test.subdir('build', 'src') + +test.write('build.py', r""" +import sys +fp = open(sys.argv[1], 'wb') +for f in sys.argv[2:]: + fp.write(open(f, 'rb').read()) +fp.close() +""") + +test.write('SConstruct', """\ +env = Environment() +env.Command('f1.out', 'f1.in', "%(python)s build.py $TARGET $SOURCE") +env.Command('f2.out', 'f2.in', "@%(python)s build.py $TARGET $SOURCE") +env.Command('f3.out', 'f3.in', "@ %(python)s build.py $TARGET $SOURCE") +env.Command('f4.out', 'f4.in', "@-%(python)s build.py $TARGET $SOURCE") +env.Command('f5.out', 'f5.in', "@- %(python)s build.py $TARGET $SOURCE") +env.Command('f6.out', 'f6.in', "-@%(python)s build.py $TARGET $SOURCE") +env.Command('f7.out', 'f7.in', "-@ %(python)s build.py $TARGET $SOURCE") +""" % locals()) + +test.write('f1.in', "f1.in\n") +test.write('f2.in', "f2.in\n") +test.write('f3.in', "f3.in\n") +test.write('f4.in', "f4.in\n") +test.write('f5.in', "f5.in\n") +test.write('f6.in', "f6.in\n") +test.write('f7.in', "f7.in\n") + +expect = test.wrap_stdout("""\ +%(python)s build.py f1.out f1.in +""" % locals()) + +test.run(arguments = '.', stdout = expect) + +test.must_match('f1.out', "f1.in\n") +test.must_match('f2.out', "f2.in\n") +test.must_match('f3.out', "f3.in\n") +test.must_match('f4.out', "f4.in\n") +test.must_match('f5.out', "f5.in\n") +test.must_match('f6.out', "f6.in\n") +test.must_match('f7.out', "f7.in\n") + +test.pass_test() |