From ac7abf113c46c5e8145cc846a4fbd09c6a5e3d76 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Mon, 27 May 2024 14:48:47 -0700
Subject: [PATCH] cleaning up tool initialization to speed up tests

---
 test/AddOption/basic.py     | 2 +-
 test/AddOption/multi-arg.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py
index 5f391784b..b087ac0ab 100644
--- a/test/AddOption/basic.py
+++ b/test/AddOption/basic.py
@@ -33,7 +33,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-    DefaultEnvironment(tools=[])
+DefaultEnvironment(tools=[])
 env = Environment(tools=[])
 AddOption('--force',
           action="store_true",
diff --git a/test/AddOption/multi-arg.py b/test/AddOption/multi-arg.py
index c2b04841b..4361214b8 100644
--- a/test/AddOption/multi-arg.py
+++ b/test/AddOption/multi-arg.py
@@ -37,7 +37,6 @@ test.write(
     'SConstruct',
     """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[])
 AddOption('--extras',
           nargs=2,
           dest='extras',
@@ -73,7 +72,6 @@ test.write(
     'SConstruct',
     """\
 DefaultEnvironment(tools=[])
-env = Environment(tools=[])
 AddOption(
     '--prefix',
     nargs=1,
@@ -103,7 +101,7 @@ test.run('-Q -q .', stdout="None\n()\n")
 # 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',
-- 
2.11.4.GIT