Add a TestSCons module for common initialization of SCons tests.

49 files changed, 579 insertions, 295 deletions

diff --git a/etc/Conscript b/etc/Conscript
index 9c59d2f..5c4efc5 100644
--- a/etc/Conscript
+++ b/etc/Conscript
@@ -6,4 +6,6 @@
 
 Import qw( env test_dir );
 
-$env->Install("#$test_dir", qw(TestCmd.py unittest.py));
+@modules = qw(TestCmd.py TestSCons.py unittest.py);
+
+$env->Install("#$test_dir", @modules);
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
new file mode 100644
index 0000000..754317e
--- /dev/null
+++ b/etc/TestSCons.py
@@ -0,0 +1,384 @@
+"""
+TestSCmd.py:  a testing framework for commands and scripts.
+
+The TestCmd module provides a framework for portable automated testing
+of executable commands and scripts (in any language, not just Python),
+especially commands and scripts that require file system interaction.
+
+In addition to running tests and evaluating conditions, the TestCmd module
+manages and cleans up one or more temporary workspace directories, and
+provides methods for creating files and directories in those workspace
+directories from in-line data, here-documents), allowing tests to be
+completely self-contained.
+
+A TestCmd environment object is created via the usual invocation:
+
+    test = TestCmd()
+
+The TestCmd module provides pass_test(), fail_test(), and no_result()
+unbound methods that report test results for use with the Aegis change
+management system.  These methods terminate the test immediately,
+reporting PASSED, FAILED, or NO RESULT respectively, and exiting with
+status 0 (success), 1 or 2 respectively.  This allows for a distinction
+between an actual failed test and a test that could not be properly
+evaluated because of an external condition (such as a full file system
+or incorrect permissions).
+"""
+
+# Copyright 2001 Steven Knight
+
+__revision__ = "TestSCons.py __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import TestCmd
+
+class TestSCons(TestCmd.TestCmd):
+    """Class for testing SCons
+    """
+
+    def __init__(self, **kw):
+	if not kw.has_key('program'):
+	    kw['program'] = 'scons.py'
+	if not kw.has_key('interpreter'):
+	    kw['interpreter'] = 'python'
+	if not kw.has_key('workdir'):
+	    kw['workdir'] = ''
+	apply(TestCmd.TestCmd.__init__, [self], kw)
+	os.chdir(self.workdir)
+
+#    def __del__(self):
+#	self.cleanup()
+#
+#    def __repr__(self):
+#	return "%x" % id(self)
+#
+#    def cleanup(self, condition = None):
+#	"""Removes any temporary working directories for the specified
+#	TestCmd environment.  If the environment variable PRESERVE was
+#	set when the TestCmd environment was created, temporary working
+#	directories are not removed.  If any of the environment variables
+#	PRESERVE_PASS, PRESERVE_FAIL, or PRESERVE_NO_RESULT were set
+#	when the TestCmd environment was created, then temporary working
+#	directories are not removed if the test passed, failed, or had
+#	no result, respectively.  Temporary working directories are also
+#	preserved for conditions specified via the preserve method.
+#
+#	Typically, this method is not called directly, but is used when
+#	the script exits to clean up temporary working directories as
+#	appropriate for the exit status.
+#	"""
+#	if not self._dirlist:
+#	    return
+#	if condition is None:
+#	    condition = self.condition
+#	#print "cleanup(" + condition + "):  ", self._preserve
+#	if self._preserve[condition]:
+#	    return
+#	os.chdir(self._cwd)
+#	self.workdir = None
+#	list = self._dirlist[:]
+#	self._dirlist = []
+#	list.reverse()
+#	for dir in list:
+#	    self.writable(dir, 1)
+#	    shutil.rmtree(dir, ignore_errors = 1)
+#	try:
+#	    global _Cleanup
+#	    _Cleanup.remove(self)
+#	except (AttributeError, ValueError):
+#	    pass
+#
+#    def description_set(self, description):
+#	"""Set the description of the functionality being tested.
+#	"""
+#	self.description = description
+#
+##    def diff(self):
+##	"""Diff two arrays.
+##	"""
+#
+#    def fail_test(self, condition = 1, function = None, skip = 0):
+#	"""Cause the test to fail.
+#	"""
+#	if not condition:
+#	    return
+#	self.condition = 'fail_test'
+#	fail_test(self = self,
+#		  condition = condition,
+#		  function = function,
+#		  skip = skip)
+#
+#    def interpreter_set(self, interpreter):
+#	"""Set the program to be used to interpret the program
+#	under test as a script.
+#	"""
+#	self.interpreter = interpreter
+#
+#    def match(self, lines, matches):
+#	"""Compare actual and expected file contents.
+#	"""
+#	return self.match_func(lines, matches)
+#
+#    def match_exact(self, lines, matches):
+#	"""Compare actual and expected file contents.
+#	"""
+#	return match_exact(lines, matches)
+#
+#    def match_re(self, lines, res):
+#	"""Compare actual and expected file contents.
+#	"""
+#	return match_re(lines, res)
+#
+#    def no_result(self, condition = 1, function = None, skip = 0):
+#	"""Report that the test could not be run.
+#	"""
+#	if not condition:
+#	    return
+#	self.condition = 'no_result'
+#	no_result(self = self,
+#		  condition = condition,
+#		  function = function,
+#		  skip = skip)
+#
+#    def pass_test(self, condition = 1, function = None):
+#	"""Cause the test to pass.
+#	"""
+#	if not condition:
+#	    return
+#	self.condition = 'pass_test'
+#	pass_test(self = self, condition = condition, function = function)
+#
+#    def preserve(self, *conditions):
+#	"""Arrange for the temporary working directories for the
+#	specified TestCmd environment to be preserved for one or more
+#	conditions.  If no conditions are specified, arranges for
+#	the temporary working directories to be preserved for all
+#	conditions.
+#	"""
+#	if conditions is ():
+#	    conditions = ('pass_test', 'fail_test', 'no_result')
+#	for cond in conditions:
+#	    self._preserve[cond] = 1
+#
+#    def program_set(self, program):
+#	"""Set the executable program or script to be tested.
+#	"""
+#	if program and not os.path.isabs(program):
+#	    program = os.path.join(self._cwd, program)
+#	self.program = program
+#
+#    def read(self, file, mode = 'rb'):
+#	"""Reads and returns the contents of the specified file name.
+#	The file name may be a list, in which case the elements are
+#	concatenated with the os.path.join() method.  The file is
+#	assumed to be under the temporary working directory unless it
+#	is an absolute path name.  The I/O mode for the file may
+#	be specified; it must begin with an 'r'.  The default is
+#	'rb' (binary read).
+#	"""
+#	if type(file) is ListType:
+#	    file = apply(os.path.join, tuple(file))
+#	if not os.path.isabs(file):
+#	    file = os.path.join(self.workdir, file)
+#	if mode[0] != 'r':
+#	    raise ValueError, "mode must begin with 'r'"
+#	return open(file, mode).read()
+#
+#    def run(self, program = None,
+#		  interpreter = None,
+#		  arguments = None,
+#		  chdir = None,
+#		  stdin = None):
+#	"""Runs a test of the program or script for the test
+#	environment.  Standard output and error output are saved for
+#	future retrieval via the stdout() and stderr() methods.
+#	"""
+#	if chdir:
+#	    oldcwd = os.getcwd()
+#	    if not os.path.isabs(chdir):
+#		chdir = os.path.join(self.workpath(chdir))
+#	    if self.verbose:
+#		sys.stderr.write("chdir(" + chdir + ")\n")
+#	    os.chdir(chdir)
+#	cmd = None
+#	if program:
+#	    if not os.path.isabs(program):
+#		program = os.path.join(self._cwd, program)
+#	    cmd = program
+#	    if interpreter:
+#		cmd = interpreter + " " + cmd
+#	else:
+#	    cmd = self.program
+#	    if self.interpreter:
+#		cmd =  self.interpreter + " " + cmd
+#	if arguments:
+#	    cmd = cmd + " " + arguments
+#	if self.verbose:
+#	    sys.stderr.write(cmd + "\n")
+#	try:
+#	    p = popen2.Popen3(cmd, 1)
+#	except AttributeError:
+#	    (tochild, fromchild, childerr) = os.popen3(cmd)
+#	    if stdin:
+#		if type(stdin) is ListType:
+#		    for line in stdin:
+#			tochild.write(line)
+#		else:
+#		    tochild.write(stdin)
+#	    tochild.close()
+#	    self._stdout.append(fromchild.read())
+#	    self._stderr.append(childerr.read())
+#	    fromchild.close()
+#	    self._status = childerr.close()
+#	except:
+#	    raise
+#	else:
+#	    if stdin:
+#		if type(stdin) is ListType:
+#		    for line in stdin:
+#			p.tochild.write(line)
+#		else:
+#		    p.tochild.write(stdin)
+#	    p.tochild.close()
+#	    self._stdout.append(p.fromchild.read())
+#	    self._stderr.append(p.childerr.read())
+#	    self.status = p.wait()
+#	if chdir:
+#	    os.chdir(oldcwd)
+#
+#    def stderr(self, run = None):
+#	"""Returns the error output from the specified run number.
+#	If there is no specified run number, then returns the error
+#	output of the last run.  If the run number is less than zero,
+#	then returns the error output from that many runs back from the
+#	current run.
+#	"""
+#	if not run:
+#	    run = len(self._stderr)
+#	elif run < 0:
+#	    run = len(self._stderr) + run
+#	run = run - 1
+#	return self._stderr[run]
+#
+#    def stdout(self, run = None):
+#	"""Returns the standard output from the specified run number.
+#	If there is no specified run number, then returns the standard
+#	output of the last run.  If the run number is less than zero,
+#	then returns the standard output from that many runs back from
+#	the current run.
+#	"""
+#	if not run:
+#	    run = len(self._stdout)
+#	elif run < 0:
+#	    run = len(self._stdout) + run
+#	run = run - 1
+#	return self._stdout[run]
+#
+#    def subdir(self, *subdirs):
+#	"""Create new subdirectories under the temporary working
+#	directory, one for each argument.  An argument may be a list,
+#	in which case the list elements are concatenated using the
+#	os.path.join() method.  Subdirectories multiple levels deep
+#	must be created using a separate argument for each level:
+#
+#		test.subdir('sub', ['sub', 'dir'], ['sub', 'dir', 'ectory'])
+#
+#	Returns the number of subdirectories actually created.
+#	"""
+#	count = 0
+#	for sub in subdirs:
+#	    if sub is None:
+#		continue
+#	    if type(sub) is ListType:
+#		sub = apply(os.path.join, tuple(sub))
+#	    new = os.path.join(self.workdir, sub)
+#	    try:
+#		os.mkdir(new)
+#	    except:
+#		pass
+#	    else:
+#		count = count + 1
+#	return count
+#
+#    def verbose_set(self, verbose):
+#	"""Set the verbose level.
+#	"""
+#	self.verbose = verbose
+#
+#    def workdir_set(self, path):
+#	"""Creates a temporary working directory with the specified
+#	path name.  If the path is a null string (''), a unique
+#	directory name is created.
+#	"""
+#	if (path != None):
+#	    if path == '':
+#		path = tempfile.mktemp()
+#	    if path != None:
+#		os.mkdir(path)
+#	    self._dirlist.append(path)
+#	    global _Cleanup
+#	    try:
+#		_Cleanup.index(self)
+#	    except ValueError:
+#		_Cleanup.append(self)
+#	    # We'd like to set self.workdir like this:
+#	    #	self.workdir = path
+#	    # But symlinks in the path will report things
+#	    # differently from os.getcwd(), so chdir there
+#	    # and back to fetch the canonical path.
+#	    cwd = os.getcwd()
+#	    os.chdir(path)
+#	    self.workdir = os.getcwd()
+#	    os.chdir(cwd)
+#	else:
+#	    self.workdir = None
+#
+#    def workpath(self, *args):
+#	"""Returns the absolute path name to a subdirectory or file
+#	within the current temporary working directory.  Concatenates
+#	the temporary working directory name with the specified
+#	arguments using the os.path.join() method.
+#	"""
+#	return apply(os.path.join, (self.workdir,) + tuple(args))
+#
+#    def writable(self, top, write):
+#	"""Make the specified directory tree writable (write == 1)
+#	or not (write == None).
+#	"""
+#
+#	def _walk_chmod(arg, dirname, names):
+#	    st = os.stat(dirname)
+#	    os.chmod(dirname, arg(st[stat.ST_MODE]))
+#	    for name in names:
+#		n = os.path.join(dirname, name)
+#		st = os.stat(n)
+#		os.chmod(n, arg(st[stat.ST_MODE]))
+#
+#	def _mode_writable(mode):
+#	    return stat.S_IMODE(mode|0200)
+#
+#	def _mode_non_writable(mode):
+#	    return stat.S_IMODE(mode&~0200)
+#
+#	if write:
+#	    f = _mode_writable
+#	else:
+#	    f = _mode_non_writable
+#	os.path.walk(top, _walk_chmod, f)
+#
+#    def write(self, file, content, mode = 'wb'):
+#	"""Writes the specified content text (second argument) to the
+#	specified file name (first argument).  The file name may be
+#	a list, in which case the elements are concatenated with the
+#	os.path.join() method.	The file is created under the temporary
+#	working directory.  Any subdirectories in the path must already
+#	exist.  The I/O mode for the file may be specified; it must
+#	begin with a 'w'.  The default is 'wb' (binary write).
+#	"""
+#	if type(file) is ListType:
+#	    file = apply(os.path.join, tuple(file))
+#	if not os.path.isabs(file):
+#	    file = os.path.join(self.workdir, file)
+#	if mode[0] != 'w':
+#	    raise ValueError, "mode must begin with 'w'"
+#	open(file, mode).write(content)
diff --git a/test/Help.py b/test/Help.py
index e6e6768..1014f6e 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 822c64f..1a0e6a6 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 78edf92..8fb0fa4 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 de24d68..10898f3 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 b68bed4..aa92ffc 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 54e26b9..09a741b 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 94911e7..165f403 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 41f9b0f..f1f4f23 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 d1389bb..7b3bc27 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 dcb56f6..a02120c 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 80de467..eaf1440 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 cf401db..8676b5c 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 0db4dc5..fd3f50f 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 6f0a2a1..e544973 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 e8c3356..0b57e35 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 91694de..75e1282 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 a0f7e9a..a453d7f 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 b28e641..e740341 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 0e7a900..e2d3165 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 0b8fb7a..4479bd5 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 2a7779e..0a7b2c7 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 8176db5..e210e1b 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 ae94be9..ce7adae 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 4d8780e..584c54d 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 6fa9ff6..fddf827 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 c2b9f3b..880accc 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 42e5f73..b13fe55 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 1dadc51..ab4d56b 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 4f7b810..c9708e0 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 9a3be5f..db2b195 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 b9dbd75..81120d1 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 92bbbc8..e836916 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 3ce1595..1bc4e40 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 ae403a6..d52ab4b 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 68e0b6d..69e431d 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 ca8051c..5f75737 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 d881715..895323b 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 245f512..0f8687a 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 f095033..5be3d08 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 cb3e05c..29d23b2 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 703b7cb..41197c4 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 d68f429..6116b95 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 66d92c7..4fdcafb 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 42c6602..9aaa545 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 8574332..6df875e 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 02b8f2c..ae68236 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 a9c466f..a2db34d 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")