diff options
| author | Steven Knight <knight@baldmt.com> | 2001-10-24 14:18:02 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2001-10-24 14:18:02 (GMT) |
| commit | 6a98a941a75eab2e4c22fa3e19cb973046f613b6 (patch) | |
| tree | fbedd2a2caa8c7d0e4a1e4b774adc6e1b1ed6d8e /test | |
| parent | 908b74a3a3ecba5eccc6fd1f844505050d9dad2f (diff) | |
| download | SCons-6a98a941a75eab2e4c22fa3e19cb973046f613b6.zip SCons-6a98a941a75eab2e4c22fa3e19cb973046f613b6.tar.gz SCons-6a98a941a75eab2e4c22fa3e19cb973046f613b6.tar.bz2 | |
Add -k support and more
Diffstat (limited to 'test')
| -rw-r--r-- | test/Program-j.py | 2 | ||||
| -rw-r--r-- | test/option-k.py | 18 | ||||
| -rw-r--r-- | test/up-to-date.py | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/test/Program-j.py b/test/Program-j.py index 95088a6..6b86127 100644 --- a/test/Program-j.py +++ b/test/Program-j.py @@ -28,8 +28,6 @@ import TestSCons test = TestSCons.TestSCons() -test.pass_test() #XXX Short-circuit until this is supported. - test.write('SConstruct', """ env = Environment() env.Program(target = 'f1', source = 'f1.c') diff --git a/test/option-k.py b/test/option-k.py index 4034d83..edf7be1 100644 --- a/test/option-k.py +++ b/test/option-k.py @@ -32,8 +32,6 @@ python = sys.executable test = TestSCons.TestSCons() -test.pass_test() #XXX Short-circuit until this is supported. - test.write('succeed.py', r""" import sys file = open(sys.argv[1], 'wb') @@ -56,25 +54,31 @@ env.Succeed(target = 'aaa.out', source = 'aaa.1') env.Succeed(target = 'bbb.out', source = 'bbb.in') """ % (python, python)) -test.run(arguments = '.') +test.run(arguments = 'aaa.out bbb.out', + stderr = + 'scons: *** [aaa.1] Error 1\n') test.fail_test(os.path.exists(test.workpath('aaa.1'))) test.fail_test(os.path.exists(test.workpath('aaa.out'))) test.fail_test(os.path.exists(test.workpath('bbb.out'))) -test.run(arguments = '-k .') +test.run(arguments = '-k aaa.out bbb.out', + stderr = + 'scons: *** [aaa.1] Error 1\n') test.fail_test(os.path.exists(test.workpath('aaa.1'))) test.fail_test(os.path.exists(test.workpath('aaa.out'))) -test.fail_test(test.read('bbb.out') != "bbb.out\n") +test.fail_test(test.read('bbb.out') != "succeed.py: bbb.out\n") test.unlink("bbb.out") -test.run(arguments = '--keep-going .') +test.run(arguments = '--keep-going aaa.out bbb.out', + stderr = + 'scons: *** [aaa.1] Error 1\n') test.fail_test(os.path.exists(test.workpath('aaa.1'))) test.fail_test(os.path.exists(test.workpath('aaa.out'))) -test.fail_test(test.read('bbb.out') != "bbb.out\n") +test.fail_test(test.read('bbb.out') != "succeed.py: bbb.out\n") test.pass_test() diff --git a/test/up-to-date.py b/test/up-to-date.py index dd7d86a..cb17621 100644 --- a/test/up-to-date.py +++ b/test/up-to-date.py @@ -59,8 +59,8 @@ test.run(arguments = 'f1.out f3.out') test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = """scons: "f1.out" is up to date. -%s build.py f2.out f2.in scons: "f3.out" is up to date. +%s build.py f2.out f2.in %s build.py f4.out f4.in """ % (python, python)) |