| Index: test/toolsets/gyptest-toolsets.py
|
| diff --git a/test/toolsets/gyptest-toolsets.py b/test/toolsets/gyptest-toolsets.py
|
| index 19737f83d0a164cb009553ac6c8d1e4054895961..f80fce70a2d0ab673f0d0b2a71067043ae4b592b 100755
|
| --- a/test/toolsets/gyptest-toolsets.py
|
| +++ b/test/toolsets/gyptest-toolsets.py
|
| @@ -7,17 +7,25 @@
|
| """
|
| Verifies that toolsets are correctly applied
|
| """
|
| -
|
| +import os
|
| +import sys
|
| import TestGyp
|
|
|
| -# Multiple toolsets are currently only supported by the make generator.
|
| -test = TestGyp.TestGyp(formats=['make'])
|
| +if sys.platform.startswith('linux'):
|
| +
|
| + test = TestGyp.TestGyp(formats=['make', 'ninja'])
|
|
|
| -test.run_gyp('toolsets.gyp')
|
| + oldenv = os.environ.copy()
|
| + try:
|
| + os.environ['GYP_CROSSCOMPILE'] = '1'
|
| + test.run_gyp('toolsets.gyp')
|
| + finally:
|
| + os.environ.clear()
|
| + os.environ.update(oldenv)
|
|
|
| -test.build('toolsets.gyp', test.ALL)
|
| + test.build('toolsets.gyp', test.ALL)
|
|
|
| -test.run_built_executable('host-main', stdout="Host\n")
|
| -test.run_built_executable('target-main', stdout="Target\n")
|
| + test.run_built_executable('host-main', stdout="Host\nShared: Host\n")
|
| + test.run_built_executable('target-main', stdout="Target\nShared: Target\n")
|
|
|
| -test.pass_test()
|
| + test.pass_test()
|
|
|