diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-14 16:28:22 -0400 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-14 16:28:22 -0400 |
| commit | 1c47ff123bf7b3bd496dccd251a88f89502c3060 (patch) | |
| tree | d92dce5ae47a87aae9f6c554fc14531392f4364b /test/Configure | |
| parent | 471e031c77be4861aa7db6951ce69ebc05d51aaa (diff) | |
| download | scons-1c47ff123bf7b3bd496dccd251a88f89502c3060.tar.gz | |
fix py2/3 mode=r and/rb, and remove native line ending translation. fixes win32
Diffstat (limited to 'test/Configure')
| -rw-r--r-- | test/Configure/ConfigureDryRunError.py | 32 | ||||
| -rw-r--r-- | test/Configure/config-h.py | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py index fa85042c..b87162c8 100644 --- a/test/Configure/ConfigureDryRunError.py +++ b/test/Configure/ConfigureDryRunError.py @@ -78,25 +78,25 @@ scons: *** Cannot update configure test "%(conftest_0_c)s" within a dry-run. test.run(arguments='-n', status=2, stderr=expect) test.run() -test.checkLogAndStdout( ["Checking for C library %s... " % lib, - "Checking for C library hopefullynolib... "], - ["yes", "no"], - [[((".c", NCR), (_obj, NCR))], - [((".c", NCR), (_obj, NCF))]], - "config.log", ".sconf_temp", "SConstruct") +test.checkLogAndStdout(["Checking for C library %s... " % lib, + "Checking for C library hopefullynolib... "], + ["yes", "no"], + [[((".c", NCR), (_obj, NCR))], + [((".c", NCR), (_obj, NCF))]], + "config.log", ".sconf_temp", "SConstruct") -oldLog = test.read(test.workpath('config.log')) +oldLog = test.read(test.workpath('config.log'), mode='r') test.run(arguments='-n') -test.checkLogAndStdout( ["Checking for C library %s... " % lib, - "Checking for C library hopefullynolib... "], - ["yes", "no"], - [[((".c", CR), (_obj, CR))], - [((".c", CR), (_obj, CF))]], - "config.log", ".sconf_temp", "SConstruct", - doCheckLog=0) - -newLog = test.read(test.workpath('config.log')) +test.checkLogAndStdout(["Checking for C library %s... " % lib, + "Checking for C library hopefullynolib... "], + ["yes", "no"], + [[((".c", CR), (_obj, CR))], + [((".c", CR), (_obj, CF))]], + "config.log", ".sconf_temp", "SConstruct", + doCheckLog=0) + +newLog = test.read(test.workpath('config.log'), mode='r') if newLog != oldLog: print("Unexpected update of log file within a dry run") test.fail_test() diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py index ff5e5b22..a5c19988 100644 --- a/test/Configure/config-h.py +++ b/test/Configure/config-h.py @@ -130,7 +130,7 @@ expected_config_h = ("""\ /* #undef HAVE_LIBHOPEFULLYNOLIB2 */ #endif /* CONFIG_H_SEEN */ -""" % locals()).replace("\n", os.linesep) +""" % locals()) test.run(stdout=expected_stdout) |