diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-29 15:07:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-29 15:07:32 (GMT) |
| commit | f2124c8cac9879ed1631ebafdbd85fd4b5a307a0 (patch) | |
| tree | fb8db1cd1b4ddbd11c2d9282be3ef5702ebe6821 /test/Configure | |
| parent | 5d502b93b7554b0b16d9ca70bb1a7a74ac012a89 (diff) | |
| download | SCons-f2124c8cac9879ed1631ebafdbd85fd4b5a307a0.zip SCons-f2124c8cac9879ed1631ebafdbd85fd4b5a307a0.tar.gz SCons-f2124c8cac9879ed1631ebafdbd85fd4b5a307a0.tar.bz2 | |
Fix use of $CHANGED_SOURCES with the --config=force option so that
.sconsign build state stays consistent.
Diffstat (limited to 'test/Configure')
| -rw-r--r-- | test/Configure/cache-not-ok.py | 2 | ||||
| -rw-r--r-- | test/Configure/option--config.py | 34 |
2 files changed, 18 insertions, 18 deletions
diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py index 339c464..48524c2 100644 --- a/test/Configure/cache-not-ok.py +++ b/test/Configure/cache-not-ok.py @@ -79,7 +79,7 @@ test.checkLogAndStdout(["Checking for C header file no_std_c_header.h... ", # Same should be true for the default behavior of Decider('content'). -test.run(arguments='--config=force target_signatures_content=1') +test.run(arguments='target_signatures_content=1 --config=force') test.checkLogAndStdout(["Checking for C header file no_std_c_header.h... ", "Checking for C library no_c_library_SAFFDG... "], ["no"]*2, diff --git a/test/Configure/option--config.py b/test/Configure/option--config.py index 807ddb5..3515c96 100644 --- a/test/Configure/option--config.py +++ b/test/Configure/option--config.py @@ -50,12 +50,12 @@ env = Environment(CPPPATH='#/include') import os env.AppendENVPath('PATH', os.environ['PATH']) conf = Configure(env) -r1 = conf.CheckCHeader('non_system_header1.h') -r2 = conf.CheckCHeader('non_system_header2.h') +conf.CheckCHeader('non_system_header0.h') +conf.CheckCHeader('non_system_header1.h') env = conf.Finish() """) -test.write(['include', 'non_system_header1.h'], """ +test.write(['include', 'non_system_header0.h'], """ /* A header */ """) @@ -70,53 +70,53 @@ scons: *** "%(conftest_0_c)s" is not yet built and cache is forced. test.run(arguments='--config=cache', status=2, stderr=expect) test.run(arguments='--config=auto') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["yes", "no"], [[((".c", NCR), (_obj, NCR))], [((".c", NCR), (_obj, NCF))]], "config.log", ".sconf_temp", "SConstruct") test.run(arguments='--config=auto') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["yes", "no"], [[((".c", CR), (_obj, CR))], [((".c", CR), (_obj, CF))]], "config.log", ".sconf_temp", "SConstruct") test.run(arguments='--config=force') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["yes", "no"], [[((".c", NCR), (_obj, NCR))], [((".c", NCR), (_obj, NCF))]], "config.log", ".sconf_temp", "SConstruct") test.run(arguments='--config=cache') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["yes", "no"], [[((".c", CR), (_obj, CR))], [((".c", CR), (_obj, CF))]], "config.log", ".sconf_temp", "SConstruct") -test.write(['include', 'non_system_header2.h'], """ +test.write(['include', 'non_system_header1.h'], """ /* Another header */ """) -test.unlink(['include', 'non_system_header1.h']) +test.unlink(['include', 'non_system_header0.h']) test.run(arguments='--config=cache') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["yes", "no"], [[((".c", CR), (_obj, CR))], [((".c", CR), (_obj, CF))]], "config.log", ".sconf_temp", "SConstruct") test.run(arguments='--config=auto') -test.checkLogAndStdout( ["Checking for C header file non_system_header1.h... ", - "Checking for C header file non_system_header2.h... "], +test.checkLogAndStdout( ["Checking for C header file non_system_header0.h... ", + "Checking for C header file non_system_header1.h... "], ["no", "yes"], [[((".c", CR), (_obj, NCF))], [((".c", CR), (_obj, NCR))]], |