diff options
author | Steven Knight <knight@baldmt.com> | 2002-05-06 22:27:28 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2002-05-06 22:27:28 (GMT) |
commit | a2ceacbe77db1b308f26454477ae3b1f1139eac8 (patch) | |
tree | 8f1532baef4ea475eb5ff7bff4e74b15e7d48a27 /test | |
parent | 06b66d7da2547d860be7a124c54d3ddf2ee964e1 (diff) | |
download | SCons-a2ceacbe77db1b308f26454477ae3b1f1139eac8.zip SCons-a2ceacbe77db1b308f26454477ae3b1f1139eac8.tar.gz SCons-a2ceacbe77db1b308f26454477ae3b1f1139eac8.tar.bz2 |
Raise an error if a builder is called multiple times for a given target, unless the builder is marked as multicall safe. (Anthony Roach)
Diffstat (limited to 'test')
-rw-r--r-- | test/AR.py | 6 | ||||
-rw-r--r-- | test/ARFLAGS.py | 6 | ||||
-rw-r--r-- | test/Alias.py | 10 | ||||
-rw-r--r-- | test/LIBPATH.py | 24 | ||||
-rw-r--r-- | test/RANLIB.py | 6 | ||||
-rw-r--r-- | test/RANLIBFLAGS.py | 6 | ||||
-rw-r--r-- | test/errors.py | 8 | ||||
-rw-r--r-- | test/exceptions.py | 5 | ||||
-rw-r--r-- | test/long-lines.py | 13 | ||||
-rw-r--r-- | test/multi.py | 236 | ||||
-rw-r--r-- | test/option--U.py | 2 |
11 files changed, 293 insertions, 29 deletions
@@ -53,8 +53,10 @@ bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], AR = r'%s wrapper.py ' + ar) foo.Library(target = 'foo', source = 'foo.c') bar.Library(target = 'bar', source = 'bar.c') -foo.Program(target = 'f', source = 'main.c') -bar.Program(target = 'b', source = 'main.c') +obj = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = obj) +bar.Program(target = 'b', source = obj) """ % python) test.write('foo.c', r""" diff --git a/test/ARFLAGS.py b/test/ARFLAGS.py index f987a2f..5e1b365 100644 --- a/test/ARFLAGS.py +++ b/test/ARFLAGS.py @@ -55,8 +55,10 @@ bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], foo.Library(target = 'foo', source = 'foo.c') bar.Library(target = 'bar', source = 'bar.c') -foo.Program(target = 'f', source = 'main.c') -bar.Program(target = 'b', source = 'main.c') +obj = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = obj) +bar.Program(target = 'b', source = obj) """ % python) test.write('foo.c', r""" diff --git a/test/Alias.py b/test/Alias.py index e6de2c0..6dae8a7 100644 --- a/test/Alias.py +++ b/test/Alias.py @@ -51,6 +51,8 @@ SConscript('sub1/SConscript', "env") SConscript('sub2/SConscript', "env") env.Alias('foo', ['f2.out', 'sub1']) env.Alias('bar', ['sub2', 'f3.out']) +env.Alias('blat', ['sub2', 'f3.out']) +env.Alias('blat', ['f2.out', 'sub1']) env.Depends('f1.out', 'bar') """ % python) @@ -107,4 +109,12 @@ test.fail_test(not os.path.exists(test.workpath('sub2', 'f9.out'))) test.up_to_date(arguments = 'f1.out') +os.unlink(test.workpath('f2.out')) +os.unlink(test.workpath('f3.out')) + +test.run(arguments = 'blat') + +test.fail_test(not os.path.exists(test.workpath('f2.out'))) +test.fail_test(not os.path.exists(test.workpath('f3.out'))) + test.pass_test() diff --git a/test/LIBPATH.py b/test/LIBPATH.py index afb87c6..871437c 100644 --- a/test/LIBPATH.py +++ b/test/LIBPATH.py @@ -44,13 +44,17 @@ prog2 = test.workpath('prog2') + _exe test.write('SConstruct', """ env1 = Environment(LIBS = [ 'foo1' ], LIBPATH = [ './lib1' ]) -env1.Program(target = 'prog', source = 'prog.c') -env1.Library(target = './lib1/foo1', source = 'f1.c') + +prog = env1.Object('prog', 'prog.c') +f1 = env1.Object('f1', 'f1.c') + +env1.Program(target = 'prog', source = prog) +env1.Library(target = './lib1/foo1', source = f1) env2 = Environment(LIBS = 'foo2', LIBPATH = '.') -env2.Program(target = 'prog2', source = 'prog.c') -env2.Library(target = 'foo2', source = 'f1.c') +env2.Program(target = 'prog2', source = prog) +env2.Library(target = 'foo2', source = f1) """) test.write('f1.c', r""" @@ -106,13 +110,17 @@ test.run(program = prog2, test.write('SConstruct', """ env1 = Environment(LIBS = [ 'foo1' ], LIBPATH = [ './lib1', './lib2' ]) -env1.Program(target = 'prog', source = 'prog.c') -env1.Library(target = './lib1/foo1', source = 'f1.c') + +prog = env1.Object('prog', 'prog.c') +f1 = env1.Object('f1', 'f1.c') + +env1.Program(target = 'prog', source = prog) +env1.Library(target = './lib1/foo1', source = f1) env2 = Environment(LIBS = 'foo2', LIBPATH = '. ./lib2') -env2.Program(target = 'prog2', source = 'prog.c') -env2.Library(target = 'foo2', source = 'f1.c') +env2.Program(target = 'prog2', source = prog) +env2.Library(target = 'foo2', source = f1) """) test.up_to_date(arguments = '.', stderr=None) diff --git a/test/RANLIB.py b/test/RANLIB.py index d255b7a..12ae212 100644 --- a/test/RANLIB.py +++ b/test/RANLIB.py @@ -64,8 +64,10 @@ bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], foo.Library(target = 'foo', source = 'foo.c') bar.Library(target = 'bar', source = 'bar.c') -foo.Program(target = 'f', source = 'main.c') -bar.Program(target = 'b', source = 'main.c') +main = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = main) +bar.Program(target = 'b', source = main) """ % python) test.write('foo.c', r""" diff --git a/test/RANLIBFLAGS.py b/test/RANLIBFLAGS.py index 5549e94..752f685 100644 --- a/test/RANLIBFLAGS.py +++ b/test/RANLIBFLAGS.py @@ -64,8 +64,10 @@ bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], RANLIB = '', foo.Library(target = 'foo', source = 'foo.c') bar.Library(target = 'bar', source = 'bar.c') -foo.Program(target = 'f', source = 'main.c') -bar.Program(target = 'b', source = 'main.c') +main = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = main) +bar.Program(target = 'b', source = main) """ % python) test.write('foo.c', r""" diff --git a/test/errors.py b/test/errors.py index 9f1a83c..fb042bb 100644 --- a/test/errors.py +++ b/test/errors.py @@ -28,7 +28,7 @@ import TestCmd import TestSCons import string -test = TestSCons.TestSCons(match = TestCmd.match_re) +test = TestSCons.TestSCons(match = TestCmd.match_re_dotall) test.write('foo.in', 'foo') test.write('exit.in', 'exit') @@ -52,11 +52,8 @@ env.exit('exit.out', 'exit.in') stderr = """scons: \*\*\* \[exit.out\] Exception Traceback \((most recent call|innermost) last\): File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ .+ .+ @@ -109,11 +106,8 @@ test.run(arguments='-f SConstruct3', stdout = "other errors\n", stderr = r"""Traceback \((most recent call|innermost) last\): File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File "SConstruct3", line \d+, in \? raise InternalError, 'error inside' InternalError: error inside diff --git a/test/exceptions.py b/test/exceptions.py index acfe9dd..b3de487 100644 --- a/test/exceptions.py +++ b/test/exceptions.py @@ -29,7 +29,7 @@ import sys import TestSCons import TestCmd -test = TestSCons.TestSCons(match = TestCmd.match_re) +test = TestSCons.TestSCons(match = TestCmd.match_re_dotall) test.write('SConstruct', """ def func(source = None, target = None, env = None): @@ -44,11 +44,8 @@ test.write('foo.in', "foo.in\n") test.run(arguments = "foo.out", stderr = """scons: \*\*\* \[foo.out\] Exception Traceback \((most recent call|innermost) last\): File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File ".+", line \d+, in .+ - .+ File "SConstruct", line 3, in func raise "func exception" func exception diff --git a/test/long-lines.py b/test/long-lines.py index a199a16..d42b570 100644 --- a/test/long-lines.py +++ b/test/long-lines.py @@ -48,7 +48,7 @@ while len(linkflags) <= 8100: env = Environment(LINKFLAGS = '$LINKXXX', LINKXXX = linkflags) env.Program(target = 'foo', source = 'foo.c') # Library(shared=1) uses $LINKFLAGS by default. -env.Library(target = 'bar', source = 'foo.c', shared=1, no_import_lib=1) +env.Library(target = 'bar', source = 'bar.c', shared=1, no_import_lib=1) """ % (linkflag, linkflag)) test.write('foo.c', r""" @@ -61,6 +61,17 @@ main(int argc, char *argv[]) } """) +test.write('bar.c', r""" +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + printf("foo.c\n"); + exit (0); +} +""") + + test.run(arguments = '.') test.up_to_date(arguments = '.') diff --git a/test/multi.py b/test/multi.py new file mode 100644 index 0000000..d955720 --- /dev/null +++ b/test/multi.py @@ -0,0 +1,236 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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__" + +import TestSCons +import os.path + +test = TestSCons.TestSCons() + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = 'foo.out', source = 'foo.in') +env.B(target = 'foo.out', source = 'bar.in') +""") + +test.write('foo.in', 'foo.in\n') +test.write('bar.in', 'bar.in\n') + +test.run(arguments='foo.out') + +test.fail_test(not os.path.exists(test.workpath('foo.out'))) +test.fail_test(not test.read('foo.out') == 'foo.in\nbar.in\n') + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=0) +env = Environment(BUILDERS = [B]) +env.B(target = 'foo.out', source = 'foo.in') +env.B(target = 'foo.out', source = 'bar.in') +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Multiple ways to build the same target were specified for: foo.out +File "SConstruct", line 10, in ? +""") + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = 'foo.out', source = 'foo.in', foo=1) +env.B(target = 'foo.out', source = 'bar.in', foo=2) +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different sets of build arguments were specified for the same target: foo.out +File "SConstruct", line 10, in ? +""") + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env2 = env.Copy(CCFLAGS='foo') +env.B(target = 'foo.out', source = 'foo.in') +env2.B(target = 'foo.out', source = 'bar.in') +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different environments were specified for the same target: foo.out +File "SConstruct", line 11, in ? +""") + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=0) +env = Environment(BUILDERS = [B]) +env.B(target = 'foo.out', source = 'foo.in') +env.B(target = 'foo.out', source = 'foo.in') +""") + +test.run(arguments='foo.out') +test.fail_test(not test.read('foo.out') == 'foo.in\n') + +test.write('SConstruct', """ +def build(env, target, source): + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +C = Builder(name='C', action=build, multi=1) +env = Environment(BUILDERS = [B,C]) +env.B(target = 'foo.out', source = 'foo.in') +env.C(target = 'foo.out', source = 'bar.in') +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different builders (B and C) were specified for the same target: foo.out +File "SConstruct", line 11, in ? +""") + +test.write('SConstruct', """ +def build(env, target, source): + for t in target: + file = open(str(t), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = ['foo.out', 'bar.out'], source = 'foo.in') +env.B(target = ['foo.out', 'bar.out'], source = 'bar.in') +""") + +test.run(arguments='bar.out') +test.fail_test(not os.path.exists(test.workpath('bar.out'))) +test.fail_test(not test.read('bar.out') == 'foo.in\nbar.in\n') +test.fail_test(not os.path.exists(test.workpath('foo.out'))) +test.fail_test(not test.read('foo.out') == 'foo.in\nbar.in\n') + +test.write('SConstruct', """ +def build(env, target, source): + for t in target: + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = ['foo.out', 'bar.out'], source = 'foo.in') +env.B(target = ['bar.out', 'foo.out'], source = 'bar.in') +""") + +# This is intentional. The order of the targets matter to the +# builder because the build command can contain things like ${TARGET[0]}: +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different target sets have a target in common: bar.out +File "SConstruct", line 11, in ? +""") + +# XXX It would be nice if the following two tests could be made to +# work by executing the action once for each unique set of +# targets. This would make it simple to deal with PDB files on Windows like so: +# +# env.Object(['foo.obj', 'vc60.pdb'], 'foo.c') +# env.Object(['bar.obj', 'vc60.pdb'], 'bar.c') + +test.write('SConstruct', """ +def build(env, target, source): + for t in target: + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = ['foo.out', 'bar.out'], source = 'foo.in') +env.B(target = ['bar.out', 'blat.out'], source = 'bar.in') +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different target sets have a target in common: bar.out +File "SConstruct", line 11, in ? +""") + +test.write('SConstruct', """ +def build(env, target, source): + for t in target: + file = open(str(target[0]), "wt") + for s in source: + file.write(open(str(s), 'rt').read()) + +B = Builder(name='B', action=build, multi=1) +env = Environment(BUILDERS = [B]) +env.B(target = ['foo.out', 'bar.out'], source = 'foo.in') +env.B(target = 'foo.out', source = 'bar.in') +""") + +test.run(arguments='foo.out', + status=2, + stderr=""" +SCons error: Two different builders (ListBuilder(B) and B) were specified for the same target: foo.out +File "SConstruct", line 11, in ? +""") + + + + +test.pass_test() diff --git a/test/option--U.py b/test/option--U.py index 7f3e3f2..b984507 100644 --- a/test/option--U.py +++ b/test/option--U.py @@ -45,7 +45,7 @@ file.close() test.write('SConstruct', """ import SCons.Defaults -B = Builder(name='B', action='%s build.py $TARGET $SOURCES') +B = Builder(name='B', action='%s build.py $TARGET $SOURCES', multi=1) env = Environment(BUILDERS = [B, SCons.Defaults.Alias]) Default(env.B(target = 'sub1/foo.out', source = 'sub1/foo.in')) Export('env') |