cleaning up tool initialization to speed up tests

Author: bdbaddog

test/AddOption/basic.py

@@ -33,7 +33,7 @@
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-    DefaultEnvironment(tools=[])
+DefaultEnvironment(tools=[])
 env = Environment(tools=[])
 AddOption('--force',
           action="store_true",

test/AddOption/multi-arg.py

@@ -37,7 +37,6 @@
     'SConstruct',
     """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[])
 AddOption('--extras',
           nargs=2,
           dest='extras',
@@ -73,7 +72,6 @@
     'SConstruct',
     """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[])
 AddOption(
     '--prefix',
     nargs=1,
@@ -103,7 +101,7 @@
 # one single-arg option
 test.run('-Q -q . --prefix=/home/foo', stdout="/home/foo\n()\n")
 # one two-arg option
-test.run('-Q -q . --extras A B', status=1, stdout="None\n('A', 'B')\n")
+test.run('-Q -q . --extras A B', status=2, stdout="None\n('A', 'B')\n")
 # single-arg option followed by two-arg option
 test.run(
     '-Q -q . --prefix=/home/foo --extras A B',