diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:53:37 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:53:37 (GMT) |
| commit | 694e80ea463c655d2e011afd4fe35109c119d6e7 (patch) | |
| tree | 566428089b48f80bab14789ec4e3d77b8d003477 /test/AR | |
| parent | 1c19e9f962b8cab0f9086615bb6409f8a326c0b8 (diff) | |
| download | SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.zip SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.gz SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.bz2 | |
Fix tests failing on win32 AR and Fortran and M4
Diffstat (limited to 'test/AR')
| -rw-r--r-- | test/AR/ARCOM.py | 2 | ||||
| -rw-r--r-- | test/AR/ARCOMSTR.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py index f9d0038..9ae5b9f 100644 --- a/test/AR/ARCOM.py +++ b/test/AR/ARCOM.py @@ -40,6 +40,7 @@ test.file_fixture('myrewrite.py') test.write('SConstruct', """ env = Environment(tools=['default', 'ar'], ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES', + RANLIB = True, RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET', LIBPREFIX = '', LIBSUFFIX = '.lib') @@ -49,6 +50,7 @@ env.Library(target = 'output', source = ['file.1', 'file.2']) test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n") test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n") + test.run(arguments = '.') test.must_match('output.lib', "file.1\nfile.2\n") diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py index 3235f12..a3a9c8e 100644 --- a/test/AR/ARCOMSTR.py +++ b/test/AR/ARCOMSTR.py @@ -42,6 +42,7 @@ test.write('SConstruct', """ env = Environment(tools=['default', 'ar'], ARCOM = r'%(_python_)s mycompile.py ar $TARGET $SOURCES', ARCOMSTR = 'Archiving $TARGET from $SOURCES', + RANLIB = True, RANLIBCOM = r'%(_python_)s myrewrite.py ranlib $TARGET', LIBPREFIX = '', LIBSUFFIX = '.lib') |