diff options
Diffstat (limited to 'test')
47 files changed, 192 insertions, 294 deletions
diff --git a/test/Help.py b/test/Help.py index e6e67686..1014f6ef 100644 --- a/test/Help.py +++ b/test/Help.py @@ -1,12 +1,10 @@ #!/usr/bin/env python -__revision__ = "test/SConstruct.py __REVISION__ __DATE__ __DEVELOPER__" +__revision__ = "test/Help.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() wpath = test.workpath() @@ -14,7 +12,7 @@ test.write('SConstruct', r""" Help("Help text\ngoes here.\n") """) -test.run(chdir = '.', arguments = '-h') +test.run(arguments = '-h') test.fail_test(test.stdout() != "Help text\ngoes here.\n\nUse scons -H for help about command-line options.\n") test.fail_test(test.stderr() != "") diff --git a/test/Program-j.py b/test/Program-j.py index 822c64fa..1a0e6a63 100644 --- a/test/Program-j.py +++ b/test/Program-j.py @@ -2,11 +2,9 @@ __revision__ = "test/Program-j.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', """ env = Environment() @@ -54,7 +52,7 @@ main(int argc, char *argv[]) """) -test.run(chdir = '.', arguments = '-j 3 f1 f2 f3 f4') +test.run(arguments = '-j 3 f1 f2 f3 f4') test.run(program = test.workpath('f1')) test.fail_test(test.stdout() != "f1.c\n") diff --git a/test/Program.py b/test/Program.py index 78edf922..8fb0fa4a 100644 --- a/test/Program.py +++ b/test/Program.py @@ -2,11 +2,9 @@ __revision__ = "test/Program.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', """ env = Environment() @@ -22,7 +20,7 @@ main(int argc, char *argv[]) } """) -test.run(chdir = '.', arguments = 'foo') +test.run(arguments = 'foo') test.run(program = test.workpath('foo')) diff --git a/test/SConscript.py b/test/SConscript.py index de24d682..10898f3c 100644 --- a/test/SConscript.py +++ b/test/SConscript.py @@ -2,11 +2,9 @@ __revision__ = "test/SConscript.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', """ import os diff --git a/test/SConstruct.py b/test/SConstruct.py index b68bed47..aa92ffcc 100644 --- a/test/SConstruct.py +++ b/test/SConstruct.py @@ -2,11 +2,9 @@ __revision__ = "test/SConstruct.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() wpath = test.workpath() diff --git a/test/errors.py b/test/errors.py index 54e26b99..09a741bc 100644 --- a/test/errors.py +++ b/test/errors.py @@ -1,17 +1,15 @@ #!/usr/bin/env python -__revision__ = "test/t0003.py __REVISION__ __DATE__ __DEVELOPER__" +__revision__ = "test/errors.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct1', """ a ! int(2.0) """) -test.run(chdir = '.', arguments='-f SConstruct1') +test.run(arguments='-f SConstruct1') test.fail_test(test.stderr() != """ File "SConstruct1", line 2 a ! int(2.0) @@ -26,34 +24,26 @@ SyntaxError: invalid syntax test.write('SConstruct2', """ raise UserError, 'Depends() require both sources and targets.' """) -test.run(chdir = '.', arguments='-f SConstruct2') +test.run(arguments='-f SConstruct2') test.fail_test(test.stderr() != """ SCons error: Depends() require both sources and targets. File "SConstruct2", line 2, in ? """) -import os -import string -sconspath = os.path.join(os.getcwd(), 'scons.py') - -# Since we're using regular expression matches below, escape any -# backslashes that ended up in the path name. (Hello, Windows!) -sconspath = string.replace(sconspath, '\\', '\\\\') - test.write('SConstruct3', """ raise InternalError, 'error inside' """) -test.run(chdir = '.', arguments='-f SConstruct3') +test.run(arguments='-f SConstruct3') expect = r"""Traceback \((most recent call|innermost) last\): - File "%s", line \d+, in \? + File ".*scons\.py", line \d+, in \? main\(\) - File "%s", line \d+, in main + File ".*scons\.py", line \d+, in main exec f in globals\(\) File "SConstruct3", line \d+, in \? raise InternalError, 'error inside' InternalError: error inside -""" % (sconspath, sconspath) +""" test.fail_test(not test.match_re(test.stderr(), expect)) test.pass_test() diff --git a/test/exitfns.py b/test/exitfns.py index 94911e76..165f403e 100644 --- a/test/exitfns.py +++ b/test/exitfns.py @@ -2,11 +2,9 @@ __revision__ = "test/exitfns.py __REVISION__ __DATE__ __DEVELOPER__" -from TestCmd import TestCmd +import TestSCons -test = TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() sconstruct = """ from scons.exitfuncs import * @@ -35,7 +33,7 @@ running x3('no kwd args', kwd=None) test.write('SConstruct', sconstruct) -test.run(chdir = '.', arguments='-f SConstruct') +test.run(arguments='-f SConstruct') test.fail_test(test.stdout() != expected_output) @@ -46,7 +44,7 @@ def f(): sys.exitfunc = f """ + sconstruct) -test.run(chdir = '.', arguments='-f SConstruct') +test.run(arguments='-f SConstruct') test.fail_test(test.stdout() != expected_output) diff --git a/test/option--.py b/test/option--.py index 41f9b0f5..f1f4f23e 100644 --- a/test/option--.py +++ b/test/option--.py @@ -1,15 +1,13 @@ #!/usr/bin/env python -__revision__ = "test/option-n.py __REVISION__ __DATE__ __DEVELOPER__" +__revision__ = "test/option--.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import os.path import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('build.py', r""" import sys @@ -28,7 +26,7 @@ env.MyBuild(target = '-f2.out', source = 'f2.in') expect = "python build.py -f1.out\npython build.py -f2.out\n" -test.run(chdir = '.', arguments = '-- -f1.out -f2.out') +test.run(arguments = '-- -f1.out -f2.out') test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") diff --git a/test/option--C.py b/test/option--C.py index d1389bbb..7b3bc277 100644 --- a/test/option--C.py +++ b/test/option--C.py @@ -2,13 +2,11 @@ __revision__ = "test/option--C.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() wpath = test.workpath() wpath_sub = test.workpath('sub') @@ -31,12 +29,12 @@ import os print "sub/dir/SConstruct", os.getcwd() """) -test.run(chdir = '.', arguments = '-C sub') +test.run(arguments = '-C sub') test.fail_test(test.stdout() != "sub/SConstruct %s\n" % wpath_sub) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '-C sub -C dir') +test.run(arguments = '-C sub -C dir') test.fail_test(test.stdout() != "sub/dir/SConstruct %s\n" % wpath_sub_dir) test.fail_test(test.stderr() != "") @@ -46,12 +44,12 @@ test.run(chdir = '.') test.fail_test(test.stdout() != "SConstruct %s\n" % wpath) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--directory=sub/dir') +test.run(arguments = '--directory=sub/dir') test.fail_test(test.stdout() != "sub/dir/SConstruct %s\n" % wpath_sub_dir) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '-C %s -C %s' % (wpath_sub_dir, wpath_sub)) +test.run(arguments = '-C %s -C %s' % (wpath_sub_dir, wpath_sub)) test.fail_test(test.stdout() != "sub/SConstruct %s\n" % wpath_sub) test.fail_test(test.stderr() != "") diff --git a/test/option--H.py b/test/option--H.py index dcb56f60..a02120cf 100644 --- a/test/option--H.py +++ b/test/option--H.py @@ -2,17 +2,15 @@ __revision__ = "test/option--H.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-H') +test.run(arguments = '-H') test.fail_test(string.find(test.stdout(), '-H, --help-options') == -1) diff --git a/test/option--I.py b/test/option--I.py index 80de4678..eaf1440c 100644 --- a/test/option--I.py +++ b/test/option--I.py @@ -2,13 +2,11 @@ __revision__ = "test/option--I.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.subdir('sub1', 'sub2') @@ -31,12 +29,12 @@ import bar print bar.variable """) -test.run(chdir = '.', arguments = '-I sub1 -I sub2') +test.run(arguments = '-I sub1 -I sub2') test.fail_test(test.stdout() != "sub1/foo\nsub2/bar\n") test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--include-dir=sub2 --include-dir=sub1') +test.run(arguments = '--include-dir=sub2 --include-dir=sub1') test.fail_test(test.stdout() != "sub2/foo\nsub2/bar\n") test.fail_test(test.stderr() != "") diff --git a/test/option--R.py b/test/option--R.py index cf401db9..8676b5ca 100644 --- a/test/option--R.py +++ b/test/option--R.py @@ -2,22 +2,20 @@ __revision__ = "test/option--R.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-R') +test.run(arguments = '-R') test.fail_test(test.stderr() != "Warning: the -R option is not yet implemented\n") -test.run(chdir = '.', arguments = '--no-builtin-variables') +test.run(arguments = '--no-builtin-variables') test.fail_test(test.stderr() != "Warning: the --no-builtin-variables option is not yet implemented\n") diff --git a/test/option--S.py b/test/option--S.py index 0db4dc5b..fd3f50f5 100644 --- a/test/option--S.py +++ b/test/option--S.py @@ -2,27 +2,25 @@ __revision__ = "test/option--S.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-S') +test.run(arguments = '-S') test.fail_test(test.stderr() != "Warning: ignoring -S option\n") -test.run(chdir = '.', arguments = '--no-keep-going') +test.run(arguments = '--no-keep-going') test.fail_test(test.stderr() != "Warning: ignoring --no-keep-going option\n") -test.run(chdir = '.', arguments = '--stop') +test.run(arguments = '--stop') test.fail_test(test.stderr() != "Warning: ignoring --stop option\n") diff --git a/test/option--W.py b/test/option--W.py index 6f0a2a1d..e5449732 100644 --- a/test/option--W.py +++ b/test/option--W.py @@ -2,32 +2,30 @@ __revision__ = "test/option--W.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-W foo') +test.run(arguments = '-W foo') test.fail_test(test.stderr() != "Warning: the -W option is not yet implemented\n") -test.run(chdir = '.', arguments = '--what-if=foo') +test.run(arguments = '--what-if=foo') test.fail_test(test.stderr() != "Warning: the --what-if option is not yet implemented\n") -test.run(chdir = '.', arguments = '--new-file=foo') +test.run(arguments = '--new-file=foo') test.fail_test(test.stderr() != "Warning: the --new-file option is not yet implemented\n") -test.run(chdir = '.', arguments = '--assume-new=foo') +test.run(arguments = '--assume-new=foo') test.fail_test(test.stderr() != "Warning: the --assume-new option is not yet implemented\n") diff --git a/test/option--Y.py b/test/option--Y.py index e8c3356b..0b57e35c 100644 --- a/test/option--Y.py +++ b/test/option--Y.py @@ -2,22 +2,20 @@ __revision__ = "test/option--Y.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-Y foo') +test.run(arguments = '-Y foo') test.fail_test(test.stderr() != "Warning: the -Y option is not yet implemented\n") -test.run(chdir = '.', arguments = '--repository=foo') +test.run(arguments = '--repository=foo') test.fail_test(test.stderr() != "Warning: the --repository option is not yet implemented\n") diff --git a/test/option--cd.py b/test/option--cd.py index 91694de7..75e1282a 100644 --- a/test/option--cd.py +++ b/test/option--cd.py @@ -2,22 +2,20 @@ __revision__ = "test/option--cd.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--cache-disable') +test.run(arguments = '--cache-disable') test.fail_test(test.stderr() != "Warning: the --cache-disable option is not yet implemented\n") -test.run(chdir = '.', arguments = '--no-cache') +test.run(arguments = '--no-cache') test.fail_test(test.stderr() != "Warning: the --no-cache option is not yet implemented\n") diff --git a/test/option--cf.py b/test/option--cf.py index a0f7e9a1..a453d7ff 100644 --- a/test/option--cf.py +++ b/test/option--cf.py @@ -2,22 +2,20 @@ __revision__ = "test/option--cf.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--cache-force') +test.run(arguments = '--cache-force') test.fail_test(test.stderr() != "Warning: the --cache-force option is not yet implemented\n") -test.run(chdir = '.', arguments = '--cache-populate') +test.run(arguments = '--cache-populate') test.fail_test(test.stderr() != "Warning: the --cache-populate option is not yet implemented\n") diff --git a/test/option--cs.py b/test/option--cs.py index b28e6419..e740341a 100644 --- a/test/option--cs.py +++ b/test/option--cs.py @@ -2,17 +2,15 @@ __revision__ = "test/option--cs.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--cache-show') +test.run(arguments = '--cache-show') test.fail_test(test.stderr() != "Warning: the --cache-show option is not yet implemented\n") diff --git a/test/option--la.py b/test/option--la.py index 0e7a900a..e2d31659 100644 --- a/test/option--la.py +++ b/test/option--la.py @@ -2,17 +2,15 @@ __revision__ = "test/option--la.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--list-actions') +test.run(arguments = '--list-actions') test.fail_test(test.stderr() != "Warning: the --list-actions option is not yet implemented\n") diff --git a/test/option--ld.py b/test/option--ld.py index 0b8fb7a8..4479bd5e 100644 --- a/test/option--ld.py +++ b/test/option--ld.py @@ -2,17 +2,15 @@ __revision__ = "test/option--ld.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--list-derived') +test.run(arguments = '--list-derived') test.fail_test(test.stderr() != "Warning: the --list-derived option is not yet implemented\n") diff --git a/test/option--lw.py b/test/option--lw.py index 2a7779ea..0a7b2c74 100644 --- a/test/option--lw.py +++ b/test/option--lw.py @@ -2,17 +2,15 @@ __revision__ = "test/option--lw.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--list-where') +test.run(arguments = '--list-where') test.fail_test(test.stderr() != "Warning: the --list-where option is not yet implemented\n") diff --git a/test/option--npd.py b/test/option--npd.py index 8176db54..e210e1b8 100644 --- a/test/option--npd.py +++ b/test/option--npd.py @@ -2,17 +2,15 @@ __revision__ = "test/option--npd.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--no-print-directory') +test.run(arguments = '--no-print-directory') test.fail_test(test.stderr() != "Warning: the --no-print-directory option is not yet implemented\n") diff --git a/test/option--override.py b/test/option--override.py index ae94be9f..ce7adae6 100644 --- a/test/option--override.py +++ b/test/option--override.py @@ -2,17 +2,15 @@ __revision__ = "test/option--override.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--override=foo') +test.run(arguments = '--override=foo') test.fail_test(test.stderr() != "Warning: the --override option is not yet implemented\n") diff --git a/test/option--random.py b/test/option--random.py index 4d8780ee..584c54df 100644 --- a/test/option--random.py +++ b/test/option--random.py @@ -2,17 +2,15 @@ __revision__ = "test/option--random.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--random') +test.run(arguments = '--random') test.fail_test(test.stderr() != "Warning: the --random option is not yet implemented\n") diff --git a/test/option--wf.py b/test/option--wf.py index 6fa9ff62..fddf827f 100644 --- a/test/option--wf.py +++ b/test/option--wf.py @@ -2,17 +2,15 @@ __revision__ = "test/option--wf.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--write-filenames=FILE') +test.run(arguments = '--write-filenames=FILE') test.fail_test(test.stderr() != "Warning: the --write-filenames option is not yet implemented\n") diff --git a/test/option--wuv.py b/test/option--wuv.py index c2b9f3ba..880acccc 100644 --- a/test/option--wuv.py +++ b/test/option--wuv.py @@ -2,17 +2,15 @@ __revision__ = "test/option--wuv.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '--warn-undefined-variables') +test.run(arguments = '--warn-undefined-variables') test.fail_test(test.stderr() != "Warning: the --warn-undefined-variables option is not yet implemented\n") diff --git a/test/option-b.py b/test/option-b.py index 42e5f739..b13fe557 100644 --- a/test/option-b.py +++ b/test/option-b.py @@ -2,17 +2,15 @@ __revision__ = "test/option-b.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-b') +test.run(arguments = '-b') test.fail_test(test.stderr() != "Warning: ignoring -b option\n") diff --git a/test/option-c.py b/test/option-c.py index 1dadc511..ab4d56bb 100644 --- a/test/option-c.py +++ b/test/option-c.py @@ -2,27 +2,25 @@ __revision__ = "test/option-c.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-c') +test.run(arguments = '-c') test.fail_test(test.stderr() != "Warning: the -c option is not yet implemented\n") -test.run(chdir = '.', arguments = '--clean') +test.run(arguments = '--clean') test.fail_test(test.stderr() != "Warning: the --clean option is not yet implemented\n") -test.run(chdir = '.', arguments = '--remove') +test.run(arguments = '--remove') test.fail_test(test.stderr() != "Warning: the --remove option is not yet implemented\n") diff --git a/test/option-d.py b/test/option-d.py index 4f7b8104..c9708e01 100644 --- a/test/option-d.py +++ b/test/option-d.py @@ -2,17 +2,15 @@ __revision__ = "test/option-d.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-d') +test.run(arguments = '-d') test.fail_test(test.stderr() != "Warning: the -d option is not yet implemented\n") diff --git a/test/option-e.py b/test/option-e.py index 9a3be5f5..db2b1954 100644 --- a/test/option-e.py +++ b/test/option-e.py @@ -2,22 +2,20 @@ __revision__ = "test/option-e.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-e') +test.run(arguments = '-e') test.fail_test(test.stderr() != "Warning: the -e option is not yet implemented\n") -test.run(chdir = '.', arguments = '--environment-overrides') +test.run(arguments = '--environment-overrides') test.fail_test(test.stderr() != "Warning: the --environment-overrides option is not yet implemented\n") diff --git a/test/option-f.py b/test/option-f.py index b9dbd75f..81120d14 100644 --- a/test/option-f.py +++ b/test/option-f.py @@ -2,12 +2,10 @@ __revision__ = "test/option-f.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import os.path -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.subdir('subdir') @@ -25,46 +23,46 @@ print "subdir/BuildThis", os.getcwd() wpath = test.workpath() -test.run(chdir = '.', arguments = '-f SConscript') +test.run(arguments = '-f SConscript') test.fail_test(test.stdout() != ("SConscript %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '-f ' + subdir_BuildThis) +test.run(arguments = '-f ' + subdir_BuildThis) test.fail_test(test.stdout() != ("subdir/BuildThis %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--file=SConscript') +test.run(arguments = '--file=SConscript') test.fail_test(test.stdout() != ("SConscript %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--file=' + subdir_BuildThis) +test.run(arguments = '--file=' + subdir_BuildThis) test.fail_test(test.stdout() != ("subdir/BuildThis %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--makefile=SConscript') +test.run(arguments = '--makefile=SConscript') test.fail_test(test.stdout() != ("SConscript %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--makefile=' + subdir_BuildThis) +test.run(arguments = '--makefile=' + subdir_BuildThis) test.fail_test(test.stdout() != ("subdir/BuildThis %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--sconstruct=SConscript') +test.run(arguments = '--sconstruct=SConscript') test.fail_test(test.stdout() != ("SConscript %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--sconstruct=' + subdir_BuildThis) +test.run(arguments = '--sconstruct=' + subdir_BuildThis) test.fail_test(test.stdout() != ("subdir/BuildThis %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '-f -', stdin = """ +test.run(arguments = '-f -', stdin = """ import os print "STDIN " + os.getcwd() """) test.fail_test(test.stdout() != ("STDIN %s\n" % wpath)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '-f no_such_file') +test.run(arguments = '-f no_such_file') test.fail_test(test.stdout() != "") test.fail_test(test.stderr() != "Ignoring missing script 'no_such_file'\n") diff --git a/test/option-h.py b/test/option-h.py index 92bbbc85..e8369163 100644 --- a/test/option-h.py +++ b/test/option-h.py @@ -2,21 +2,19 @@ __revision__ = "test/option-h.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() -test.run(chdir = '.', arguments = '-h') +test.run(arguments = '-h') test.fail_test(string.find(test.stdout(), '-h, --help') == -1) test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-h') +test.run(arguments = '-h') test.fail_test(string.find(test.stdout(), '-h, --help') == -1) diff --git a/test/option-i.py b/test/option-i.py index 3ce15952..1bc4e409 100644 --- a/test/option-i.py +++ b/test/option-i.py @@ -2,22 +2,20 @@ __revision__ = "test/option-i.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-i') +test.run(arguments = '-i') test.fail_test(test.stderr() != "Warning: the -i option is not yet implemented\n") -test.run(chdir = '.', arguments = '--ignore-errors') +test.run(arguments = '--ignore-errors') test.fail_test(test.stderr() != "Warning: the --ignore-errors option is not yet implemented\n") diff --git a/test/option-j.py b/test/option-j.py index ae403a6a..d52ab4bd 100644 --- a/test/option-j.py +++ b/test/option-j.py @@ -2,7 +2,7 @@ __revision__ = "test/option-j.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys @@ -16,9 +16,7 @@ except ImportError: sys.exit() -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('build.py', r""" import time @@ -42,7 +40,7 @@ def RunTest(args): test.write('f1.in', 'f1.in') test.write('f2.in', 'f2.in') - test.run(chdir = '.', arguments = args) + test.run(arguments = args) str = test.read("f1") start1,finish1 = map(float, string.split(str, "\n")) diff --git a/test/option-k.py b/test/option-k.py index 68e0b6d8..69e431dd 100644 --- a/test/option-k.py +++ b/test/option-k.py @@ -2,22 +2,20 @@ __revision__ = "test/option-k.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-k') +test.run(arguments = '-k') test.fail_test(test.stderr() != "Warning: the -k option is not yet implemented\n") -test.run(chdir = '.', arguments = '--keep-going') +test.run(arguments = '--keep-going') test.fail_test(test.stderr() != "Warning: the --keep-going option is not yet implemented\n") diff --git a/test/option-l.py b/test/option-l.py index ca8051ca..5f75737d 100644 --- a/test/option-l.py +++ b/test/option-l.py @@ -2,27 +2,25 @@ __revision__ = "test/option-l.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-l 1') +test.run(arguments = '-l 1') test.fail_test(test.stderr() != "Warning: the -l option is not yet implemented\n") -test.run(chdir = '.', arguments = '--load-average=1') +test.run(arguments = '--load-average=1') test.fail_test(test.stderr() != "Warning: the --load-average option is not yet implemented\n") -test.run(chdir = '.', arguments = '--max-load=1') +test.run(arguments = '--max-load=1') test.fail_test(test.stderr() != "Warning: the --max-load option is not yet implemented\n") diff --git a/test/option-m.py b/test/option-m.py index d881715b..895323b1 100644 --- a/test/option-m.py +++ b/test/option-m.py @@ -2,17 +2,15 @@ __revision__ = "test/option-m.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-m') +test.run(arguments = '-m') test.fail_test(test.stderr() != "Warning: ignoring -m option\n") diff --git a/test/option-n.py b/test/option-n.py index 245f512a..0f8687a4 100644 --- a/test/option-n.py +++ b/test/option-n.py @@ -2,14 +2,12 @@ __revision__ = "test/option-n.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import os.path import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('build.py', r""" import sys @@ -29,7 +27,7 @@ env.MyBuild(target = 'f2.out', source = 'f2.in') args = 'f1.out f2.out' expect = "python build.py f1.out\npython build.py f2.out\n" -test.run(chdir = '.', arguments = args) +test.run(arguments = args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") @@ -39,35 +37,35 @@ test.fail_test(not os.path.exists(test.workpath('f2.out'))) os.unlink(test.workpath('f1.out')) os.unlink(test.workpath('f2.out')) -test.run(chdir = '.', arguments = '-n ' + args) +test.run(arguments = '-n ' + args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") test.fail_test(os.path.exists(test.workpath('f1.out'))) test.fail_test(os.path.exists(test.workpath('f2.out'))) -test.run(chdir = '.', arguments = '--no-exec ' + args) +test.run(arguments = '--no-exec ' + args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") test.fail_test(os.path.exists(test.workpath('f1.out'))) test.fail_test(os.path.exists(test.workpath('f2.out'))) -test.run(chdir = '.', arguments = '--just-print ' + args) +test.run(arguments = '--just-print ' + args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") test.fail_test(os.path.exists(test.workpath('f1.out'))) test.fail_test(os.path.exists(test.workpath('f2.out'))) -test.run(chdir = '.', arguments = '--dry-run ' + args) +test.run(arguments = '--dry-run ' + args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") test.fail_test(os.path.exists(test.workpath('f1.out'))) test.fail_test(os.path.exists(test.workpath('f2.out'))) -test.run(chdir = '.', arguments = '--recon ' + args) +test.run(arguments = '--recon ' + args) test.fail_test(test.stdout() != expect) test.fail_test(test.stderr() != "") diff --git a/test/option-o.py b/test/option-o.py index f095033c..5be3d088 100644 --- a/test/option-o.py +++ b/test/option-o.py @@ -2,27 +2,25 @@ __revision__ = "test/option-o.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-o foo') +test.run(arguments = '-o foo') test.fail_test(test.stderr() != "Warning: the -o option is not yet implemented\n") -test.run(chdir = '.', arguments = '--old-file=foo') +test.run(arguments = '--old-file=foo') test.fail_test(test.stderr() != "Warning: the --old-file option is not yet implemented\n") -test.run(chdir = '.', arguments = '--assume-old=foo') +test.run(arguments = '--assume-old=foo') test.fail_test(test.stderr() != "Warning: the --assume-old option is not yet implemented\n") diff --git a/test/option-p.py b/test/option-p.py index cb3e05cb..29d23b21 100644 --- a/test/option-p.py +++ b/test/option-p.py @@ -2,17 +2,15 @@ __revision__ = "test/option-p.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-p') +test.run(arguments = '-p') test.fail_test(test.stderr() != "Warning: the -p option is not yet implemented\n") diff --git a/test/option-q.py b/test/option-q.py index 703b7cbc..41197c44 100644 --- a/test/option-q.py +++ b/test/option-q.py @@ -2,22 +2,20 @@ __revision__ = "test/option-q.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-q') +test.run(arguments = '-q') test.fail_test(test.stderr() != "Warning: the -q option is not yet implemented\n") -test.run(chdir = '.', arguments = '--question') +test.run(arguments = '--question') test.fail_test(test.stderr() != "Warning: the --question option is not yet implemented\n") diff --git a/test/option-r.py b/test/option-r.py index d68f4299..6116b955 100644 --- a/test/option-r.py +++ b/test/option-r.py @@ -2,22 +2,20 @@ __revision__ = "test/option-r.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-r') +test.run(arguments = '-r') test.fail_test(test.stderr() != "Warning: the -r option is not yet implemented\n") -test.run(chdir = '.', arguments = '--no-builtin-rules') +test.run(arguments = '--no-builtin-rules') test.fail_test(test.stderr() != "Warning: the --no-builtin-rules option is not yet implemented\n") diff --git a/test/option-s.py b/test/option-s.py index 66d92c79..4fdcafb2 100644 --- a/test/option-s.py +++ b/test/option-s.py @@ -2,14 +2,12 @@ __revision__ = "test/option-s.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import os.path import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('build.py', r""" import sys @@ -26,7 +24,7 @@ env.MyBuild(target = 'f1.out', source = 'f1.in') env.MyBuild(target = 'f2.out', source = 'f2.in') """) -test.run(chdir = '.', arguments = '-s f1.out f2.out') +test.run(arguments = '-s f1.out f2.out') test.fail_test(test.stdout() != "") test.fail_test(test.stderr() != "") @@ -36,7 +34,7 @@ test.fail_test(not os.path.exists(test.workpath('f2.out'))) os.unlink(test.workpath('f1.out')) os.unlink(test.workpath('f2.out')) -test.run(chdir = '.', arguments = '--silent f1.out f2.out') +test.run(arguments = '--silent f1.out f2.out') test.fail_test(test.stdout() != "") test.fail_test(test.stderr() != "") @@ -46,7 +44,7 @@ test.fail_test(not os.path.exists(test.workpath('f2.out'))) os.unlink(test.workpath('f1.out')) os.unlink(test.workpath('f2.out')) -test.run(chdir = '.', arguments = '--quiet f1.out f2.out') +test.run(arguments = '--quiet f1.out f2.out') test.fail_test(test.stdout() != "") test.fail_test(test.stderr() != "") diff --git a/test/option-t.py b/test/option-t.py index 42c66025..9aaa545a 100644 --- a/test/option-t.py +++ b/test/option-t.py @@ -2,22 +2,20 @@ __revision__ = "test/option-t.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-t') +test.run(arguments = '-t') test.fail_test(test.stderr() != "Warning: ignoring -t option\n") -test.run(chdir = '.', arguments = '--touch') +test.run(arguments = '--touch') test.fail_test(test.stderr() != "Warning: ignoring --touch option\n") diff --git a/test/option-u.py b/test/option-u.py index 8574332d..6df875e3 100644 --- a/test/option-u.py +++ b/test/option-u.py @@ -2,17 +2,15 @@ __revision__ = "test/option-u.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-u') +test.run(arguments = '-u') test.fail_test(test.stderr() != "Warning: the -u option is not yet implemented\n") diff --git a/test/option-v.py b/test/option-v.py index 02b8f2c8..ae682364 100644 --- a/test/option-v.py +++ b/test/option-v.py @@ -2,17 +2,15 @@ __revision__ = "test/option-v.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-v') +test.run(arguments = '-v') expect = r"""SCons version \S+, by Steven Knight et al. Copyright 2001 Steven Knight @@ -21,7 +19,7 @@ Copyright 2001 Steven Knight test.fail_test(not test.match_re(test.stdout(), expect)) test.fail_test(test.stderr() != "") -test.run(chdir = '.', arguments = '--version') +test.run(arguments = '--version') test.fail_test(not test.match_re(test.stdout(), expect)) test.fail_test(test.stderr() != "") diff --git a/test/option-w.py b/test/option-w.py index a9c466fe..a2db34db 100644 --- a/test/option-w.py +++ b/test/option-w.py @@ -2,22 +2,20 @@ __revision__ = "test/option-w.py __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd +import TestSCons import string import sys -test = TestCmd.TestCmd(program = 'scons.py', - workdir = '', - interpreter = 'python') +test = TestSCons.TestSCons() test.write('SConstruct', "") -test.run(chdir = '.', arguments = '-w') +test.run(arguments = '-w') test.fail_test(test.stderr() != "Warning: the -w option is not yet implemented\n") -test.run(chdir = '.', arguments = '--print-directory') +test.run(arguments = '--print-directory') test.fail_test(test.stderr() != "Warning: the --print-directory option is not yet implemented\n") |