From dacc40883c2844eae068d1b4cf7e8849c56f7cb3 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 16 Feb 2010 16:36:14 +0000 Subject: Move two Builder-related tests into the test/Builder/ subdirectory. --- test/BadBuilder.py | 106 ----------------------------------------------- test/Builder/errors.py | 106 +++++++++++++++++++++++++++++++++++++++++++++++ test/Builder/wrapper.py | 74 +++++++++++++++++++++++++++++++++ test/builder-wrappers.py | 74 --------------------------------- 4 files changed, 180 insertions(+), 180 deletions(-) delete mode 100644 test/BadBuilder.py create mode 100644 test/Builder/errors.py create mode 100644 test/Builder/wrapper.py delete mode 100644 test/builder-wrappers.py diff --git a/test/BadBuilder.py b/test/BadBuilder.py deleted file mode 100644 index 1e4e16c..0000000 --- a/test/BadBuilder.py +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# 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. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test the ability to catch Builder creation with poorly specified Actions. -""" - -import os.path - -import TestSCons - -test = TestSCons.TestSCons() - -SConstruct_path = test.workpath('SConstruct') - -sconstruct = """ -def buildop(env, source, target): - outf = open(str(target[0]), 'wb') - inpf = open(str(source[0]), 'r') - for line in inpf.readlines(): - if line.find(str(target[0])) == -1: - outf.write(line) - inpf.close() - outf.close() -b1 = Builder(action=buildop, src_suffix='.a', suffix='.b') -%s -env=Environment(tools=[], BUILDERS={'b1':b1, 'b2':b2}) -foo_b = env.b1(source='foo.a') -env.b2(source=foo_b) -""" - -test.write('foo.a', """\ -foo.c -foo.b -built -""") - -python_file_line = test.python_file_line(SConstruct_path, 14) - -### Gross mistake in Builder spec - -test.write(SConstruct_path, sconstruct % '\ -b2 = Builder(act__ion=buildop, src_suffix=".b", suffix=".c")') - -expect_stderr = """\ - -scons: *** Builder b2 must have an action to build ['foo.c']. -""" + python_file_line - -test.run(arguments='.', stderr=expect_stderr, status = 2) - -### Subtle mistake in Builder spec - -test.write(SConstruct_path, sconstruct % '\ -b2 = Builder(actoin=buildop, src_suffix=".b", suffix=".c")') - -expect_stderr="""\ - -scons: *** Builder b2 must have an action to build ['foo.c']. -""" + python_file_line - -test.run(arguments='test2', stderr=expect_stderr, status=2) - -### Missing action in Builder spec - -test.write(SConstruct_path, sconstruct % '\ -b2 = Builder(src_suffix=".b", suffix=".c")') - -expect_stderr = """\ - -scons: *** Builder b2 must have an action to build ['foo.c']. -""" + python_file_line - -test.run(arguments='test2', stderr=expect_stderr, status = 2) - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Builder/errors.py b/test/Builder/errors.py new file mode 100644 index 0000000..1e4e16c --- /dev/null +++ b/test/Builder/errors.py @@ -0,0 +1,106 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# 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. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Test the ability to catch Builder creation with poorly specified Actions. +""" + +import os.path + +import TestSCons + +test = TestSCons.TestSCons() + +SConstruct_path = test.workpath('SConstruct') + +sconstruct = """ +def buildop(env, source, target): + outf = open(str(target[0]), 'wb') + inpf = open(str(source[0]), 'r') + for line in inpf.readlines(): + if line.find(str(target[0])) == -1: + outf.write(line) + inpf.close() + outf.close() +b1 = Builder(action=buildop, src_suffix='.a', suffix='.b') +%s +env=Environment(tools=[], BUILDERS={'b1':b1, 'b2':b2}) +foo_b = env.b1(source='foo.a') +env.b2(source=foo_b) +""" + +test.write('foo.a', """\ +foo.c +foo.b +built +""") + +python_file_line = test.python_file_line(SConstruct_path, 14) + +### Gross mistake in Builder spec + +test.write(SConstruct_path, sconstruct % '\ +b2 = Builder(act__ion=buildop, src_suffix=".b", suffix=".c")') + +expect_stderr = """\ + +scons: *** Builder b2 must have an action to build ['foo.c']. +""" + python_file_line + +test.run(arguments='.', stderr=expect_stderr, status = 2) + +### Subtle mistake in Builder spec + +test.write(SConstruct_path, sconstruct % '\ +b2 = Builder(actoin=buildop, src_suffix=".b", suffix=".c")') + +expect_stderr="""\ + +scons: *** Builder b2 must have an action to build ['foo.c']. +""" + python_file_line + +test.run(arguments='test2', stderr=expect_stderr, status=2) + +### Missing action in Builder spec + +test.write(SConstruct_path, sconstruct % '\ +b2 = Builder(src_suffix=".b", suffix=".c")') + +expect_stderr = """\ + +scons: *** Builder b2 must have an action to build ['foo.c']. +""" + python_file_line + +test.run(arguments='test2', stderr=expect_stderr, status = 2) + + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Builder/wrapper.py b/test/Builder/wrapper.py new file mode 100644 index 0000000..55a0f24 --- /dev/null +++ b/test/Builder/wrapper.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# 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. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Test the ability to use a direct Python function to wrap +calls to other Builder(s). +""" + +import TestSCons + +test = TestSCons.TestSCons() + +test.write('SConstruct', """ +import os.path +import string +def cat(target, source, env): + fp = open(str(target[0]), 'wb') + for s in map(str, source): + fp.write(open(s, 'rb').read()) +Cat = Builder(action=cat) +def Wrapper(env, target, source): + if not target: + target = [string.replace(str(source[0]), '.in', '.wout')] + t1 = 't1-'+str(target[0]) + source = 's-'+str(source[0]) + env.Cat(t1, source) + t2 = 't2-'+str(target[0]) + env.Cat(t2, source) +env = Environment(BUILDERS = {'Cat' : Cat, + 'Wrapper' : Wrapper}) +env.Wrapper('f1.out', 'f1.in') +env.Wrapper('f2.in') +""") + +test.write('s-f1.in', "s-f1.in\n") +test.write('s-f2.in', "s-f2.in\n") + +test.run() + +test.must_match('t1-f1.out', "s-f1.in\n") +test.must_match('t1-f2.wout', "s-f2.in\n") +test.must_match('t2-f1.out', "s-f1.in\n") +test.must_match('t2-f2.wout', "s-f2.in\n") + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/builder-wrappers.py b/test/builder-wrappers.py deleted file mode 100644 index 55a0f24..0000000 --- a/test/builder-wrappers.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# 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. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test the ability to use a direct Python function to wrap -calls to other Builder(s). -""" - -import TestSCons - -test = TestSCons.TestSCons() - -test.write('SConstruct', """ -import os.path -import string -def cat(target, source, env): - fp = open(str(target[0]), 'wb') - for s in map(str, source): - fp.write(open(s, 'rb').read()) -Cat = Builder(action=cat) -def Wrapper(env, target, source): - if not target: - target = [string.replace(str(source[0]), '.in', '.wout')] - t1 = 't1-'+str(target[0]) - source = 's-'+str(source[0]) - env.Cat(t1, source) - t2 = 't2-'+str(target[0]) - env.Cat(t2, source) -env = Environment(BUILDERS = {'Cat' : Cat, - 'Wrapper' : Wrapper}) -env.Wrapper('f1.out', 'f1.in') -env.Wrapper('f2.in') -""") - -test.write('s-f1.in', "s-f1.in\n") -test.write('s-f2.in', "s-f2.in\n") - -test.run() - -test.must_match('t1-f1.out', "s-f1.in\n") -test.must_match('t1-f2.wout', "s-f2.in\n") -test.must_match('t2-f1.out', "s-f1.in\n") -test.must_match('t2-f2.wout', "s-f2.in\n") - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12