Updated to expected configure context temporary and generated files to match new scheme to add contents and action hash to file name to avoid mistakenly reusing the wrong temp file based on changing the order and/or number of the configure tests being run between successive runs

4 files changed, 7 insertions, 6 deletions

diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index 1b89b03aa..ad40ea4f0 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -67,7 +67,7 @@ test.run(arguments='-n', status=2, stderr=expect)
 test.must_not_exist('config.log')
 test.subdir('.sconf_temp')
 
-conftest_0_c = os.path.join(".sconf_temp", "conftest_0.c")
+conftest_0_c = os.path.join(".sconf_temp", "conftest_df286a1d2f67e69d030b4eff75ca7e12_0.c")
 SConstruct_file_line = test.python_file_line(SConstruct_path, 6)[:-1]
 
 expect = """
diff --git a/test/Configure/basic.py b/test/Configure/basic.py
index 4038a4557..253fa2510 100644
--- a/test/Configure/basic.py
+++ b/test/Configure/basic.py
@@ -28,11 +28,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that basic builds work with Configure contexts.
 """
 
-import TestSCons
+from TestSCons import TestSCons, ConfigCheckInfo, _obj
+from TestCmd import IS_WINDOWS
 
-_obj = TestSCons._obj
 
-test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
+test = TestSCons(match = TestSCons.match_re_dotall)
 
 NCR = test.NCR  # non-cached rebuild
 CR  = test.CR   # cached rebuild (up to date)
diff --git a/test/Configure/implicit-cache.py b/test/Configure/implicit-cache.py
index 1a9ff343a..20bdebbfb 100644
--- a/test/Configure/implicit-cache.py
+++ b/test/Configure/implicit-cache.py
@@ -77,7 +77,7 @@ test.write('foo.h', "#define FOO 1\n")
 
 test.run(arguments = '.')
 
-test.run_sconsign('-d .sconf_temp -e conftest_0.c --raw .sconsign.dblite')
+test.run_sconsign('-d .sconf_temp -e conftest_5a3fa36d51dd2a28d521d6cc0e2e1d04_0.c --raw .sconsign.dblite')
 old_sconsign_dblite = test.stdout()
 
 # Second run:  Have the configure subsystem also look for foo.h, so
@@ -90,7 +90,7 @@ old_sconsign_dblite = test.stdout()
 
 test.run(arguments = '--implicit-cache USE_FOO=1 .')
 
-test.run_sconsign('-d .sconf_temp -e conftest_0.c --raw .sconsign.dblite')
+test.run_sconsign('-d .sconf_temp -e conftest_5a3fa36d51dd2a28d521d6cc0e2e1d04_0.c --raw .sconsign.dblite')
 new_sconsign_dblite = test.stdout()
 
 if old_sconsign_dblite != new_sconsign_dblite:
diff --git a/test/Configure/issue-3469/fixture/SConstruct.2 b/test/Configure/issue-3469/fixture/SConstruct.2
index df0799376..171dc3930 100644
--- a/test/Configure/issue-3469/fixture/SConstruct.2
+++ b/test/Configure/issue-3469/fixture/SConstruct.2
@@ -32,6 +32,7 @@ if env['SKIP'] and not conf.CheckCXXHeader('math.h'):
     Exit(1)
 
 
+
 #
 # if not conf.CheckCHeader('stdlib.h'):
 #     print('stdlib.h must be installed!')