Add a TestSCons module for common initialization of SCons tests.

1 files changed, 6 insertions, 8 deletions

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() != "")