diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-06 15:35:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 15:35:46 (GMT) |
| commit | 62988851545585d00f372cd1dd1774fde0576843 (patch) | |
| tree | cc87334eec7232ddd8fc8c20935c745e4118b4df | |
| parent | d10f3da341d937bce176629ca882bcebd2235a46 (diff) | |
| parent | 8ed65dec4a099c39e3e6b7f2d2f97145066ac882 (diff) | |
| download | SCons-62988851545585d00f372cd1dd1774fde0576843.zip SCons-62988851545585d00f372cd1dd1774fde0576843.tar.gz SCons-62988851545585d00f372cd1dd1774fde0576843.tar.bz2 | |
Merge pull request #3235 from bdbaddog/fix_win_java_multi_step
Fix Java/multi-step.py to avoid picking up cygwin or mingw's link.exe which takes different arguments than the expected msvc linker
| -rw-r--r-- | test/Java/multi-step.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py index 33e2a5f..f5ee257 100644 --- a/test/Java/multi-step.py +++ b/test/Java/multi-step.py @@ -45,6 +45,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') +# Skip this test on AppVeyor + # Skip this test as SCons doesn't (currently) predict the generated # inner/anonymous class generated .class files generated by gcj # and so will always fail @@ -72,10 +74,17 @@ test.subdir(['src'], test.write(['SConstruct'], """\ import os,sys -env=Environment(tools = ['default', 'javac', 'javah', 'swig'], + +if sys.platform == 'win32': + # Ensure tests don't pick up link from mingw or cygwin + tools = ['msvc', 'mslink', 'jar', 'javac', 'javah', 'swig'] +else: + tools = ['default', 'javac', 'javah', 'swig'] + +env=Environment(tools = tools, CPPPATH=["$JAVAINCLUDES"]) Export('env') -env.PrependENVPath('PATH',os.environ.get('PATH',[])) +# env.PrependENVPath('PATH',os.environ.get('PATH',[])) env['INCPREFIX']='-I' env.Append(SWIGFLAGS=['-c++','$_CPPINCFLAGS']) |