diff options
author | Steven Knight <knight@baldmt.com> | 2001-09-24 14:16:04 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2001-09-24 14:16:04 (GMT) |
commit | cf97a90442df5f8b835bb81aa5139e142baaf446 (patch) | |
tree | 38b6a16f2ac93941a08d32dc22c6991a15bc0bc8 /test | |
parent | 6d2e37c6e4552fc39dc01fd69d0e4dd8d8edf356 (diff) | |
download | SCons-cf97a90442df5f8b835bb81aa5139e142baaf446.zip SCons-cf97a90442df5f8b835bb81aa5139e142baaf446.tar.gz SCons-cf97a90442df5f8b835bb81aa5139e142baaf446.tar.bz2 |
Enhance Builders to take any type of node as input.
Diffstat (limited to 'test')
-rw-r--r-- | test/Depends.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/test/Depends.py b/test/Depends.py index 5c6c4f1..ccbcf26 100644 --- a/test/Depends.py +++ b/test/Depends.py @@ -6,8 +6,6 @@ import TestSCons test = TestSCons.TestSCons() -test.pass_test() #XXX Short-circuit until this is implemented. - test.subdir('subdir') test.write('build.py', r""" @@ -24,16 +22,16 @@ Foo = Builder(name = "Foo", Bar = Builder(name = "Bar", action = "python build.py %(target)s %(source)s subdir/bar.dep") env = Environment(BUILDERS = [Foo, Bar]) -env.Depends(target = ['f1.out', 'f2.out'], source = 'subdir/foo.dep') -env.Depends(target = 'f3.out', source = 'subdir/bar.dep') +env.Depends(target = ['f1.out', 'f2.out'], dependency = 'subdir/foo.dep') +env.Depends(target = 'f3.out', dependency = 'subdir/bar.dep') env.Foo(target = 'f1.out', source = 'f1.in') env.Foo(target = 'f2.out', source = 'f2.in') env.Bar(target = 'f3.out', source = 'f3.in') -SConscript('subdir/SConscript') +Conscript('subdir/SConscript') """) test.write(['subdir', 'SConscript'], """ -env.Depends(target = 'f4.out', source = 'bar.dep') +env.Depends(target = 'f4.out', dependency = 'bar.dep') env.Foo(target = 'f4.out', source = 'f4.in') """) @@ -41,40 +39,45 @@ test.write('f1.in', "f1.in\n") test.write('f2.in', "f2.in\n") +test.write('f3.in', "f3.in\n") + test.write(['subdir', 'f4.in'], "subdir/f4.in\n") test.write(['subdir', 'foo.dep'], "subdir/foo.dep 1\n") test.write(['subdir', 'bar.dep'], "subdir/bar.dep 1\n") -test.run(arguments = '.') +#XXXtest.run(arguments = '.') +test.run(arguments = 'f1.out f2.out f3.out subdir/f4.out') test.fail_test(test.read('f1.out') != "f1.in\nsubdir/foo.dep 1\n") test.fail_test(test.read('f2.out') != "f2.in\nsubdir/foo.dep 1\n") test.fail_test(test.read('f3.out') != "f3.in\nsubdir/bar.dep 1\n") -test.fail_test(test.read('subdir', 'f4.out') != - "subdir/f4.in\nsubdir/bar.dep 1\n") +#XXXtest.fail_test(test.read(['subdir', 'f4.out']) != +#XXX "subdir/f4.in\nsubdir/bar.dep 1\n") test.write(['subdir', 'foo.dep'], "subdir/foo.dep 2\n") test.write(['subdir', 'bar.dep'], "subdir/bar.dep 2\n") -test.run(arguments = '.') +#XXXtest.run(arguments = '.') +test.run(arguments = 'f1.out f2.out f3.out subdir/f4.out') test.fail_test(test.read('f1.out') != "f1.in\nsubdir/foo.dep 2\n") test.fail_test(test.read('f2.out') != "f2.in\nsubdir/foo.dep 2\n") test.fail_test(test.read('f3.out') != "f3.in\nsubdir/bar.dep 2\n") -test.fail_test(test.read('subdir', 'f4.out') != - "subdir/f4.in\nsubdir/bar.dep 2\n") +#XXXtest.fail_test(test.read(['subdir', 'f4.out']) != +#XXX "subdir/f4.in\nsubdir/bar.dep 2\n") test.write(['subdir', 'bar.dep'], "subdir/bar.dep 3\n") -test.run(arguments = '.') +#XXXtest.run(arguments = '.') +test.run(arguments = 'f1.out f2.out f3.out subdir/f4.out') test.fail_test(test.read('f1.out') != "f1.in\nsubdir/foo.dep 2\n") test.fail_test(test.read('f2.out') != "f2.in\nsubdir/foo.dep 2\n") -test.fail_test(test.read('f3.out') != "f3.in\nsubdir/bar.dep 2\n") -test.fail_test(test.read('subdir', 'f4.out') != - "subdir/f4.in\nsubdir/bar.dep 3\n") +test.fail_test(test.read('f3.out') != "f3.in\nsubdir/bar.dep 3\n") +#XXXtest.fail_test(test.read(['subdir', 'f4.out']) != +#XXX "subdir/f4.in\nsubdir/bar.dep 3\n") test.pass_test() |