Simplify use of dir_fixture and some test logic. Added DefaultEnvironment(tools=[]) to speed up on windows

2 files changed, 4 insertions, 11 deletions

diff --git a/test/Configure/CheckLibWithHeader_extra_libs.py b/test/Configure/CheckLibWithHeader_extra_libs.py
index eef5c0e..5e7d450 100644
--- a/test/Configure/CheckLibWithHeader_extra_libs.py
+++ b/test/Configure/CheckLibWithHeader_extra_libs.py
@@ -33,18 +33,10 @@ from pathlib import Path
 from TestSCons import TestSCons, dll_, _dll
 
 test = TestSCons(match=TestSCons.match_re_dotall)
+test.dir_fixture(['fixture', 'checklib_extra'],)
 
-# This is the first library project
-libA_dir = Path(test.workdir) / "libA"
-libA_dir.mkdir()
-libA = str(libA_dir / (dll_ + 'A' + _dll))  # for existence check
-test.dir_fixture(['fixture', 'checklib_extra', 'libA'], 'libA')
-
-# This is the second library project, depending on the first
-libB_dir = Path(test.workdir) / "libB"
-libB_dir.mkdir()
-libB = str(libB_dir / (dll_ + 'B' + _dll))  # for existence check
-test.dir_fixture(['fixture', 'checklib_extra', 'libB'], 'libB')
+libA = f"libA/{dll_}A{_dll}"
+libB = f"libB/{dll_}B{_dll}"
 
 test.run(arguments='-C libA')
 test.must_exist(libA)
diff --git a/test/Configure/fixture/checklib_extra/SConstruct b/test/Configure/fixture/checklib_extra/SConstruct
index 177dc16..82bf5aa 100644
--- a/test/Configure/fixture/checklib_extra/SConstruct
+++ b/test/Configure/fixture/checklib_extra/SConstruct
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: MIT
 #
 # Copyright The SCons Foundation
+DefaultEnvironment(tools=[])
 
 env = Environment(
     CPPPATH=['#'],