| Index: test/win/gyptest-link-safeseh.py
|
| diff --git a/test/win/gyptest-link-safeseh.py b/test/win/gyptest-link-safeseh.py
|
| index 0d840096327b95f8f1f1c72e28f7a558dcc88240..31a25673f49f3d9b68a7dda134a614d48347987e 100644
|
| --- a/test/win/gyptest-link-safeseh.py
|
| +++ b/test/win/gyptest-link-safeseh.py
|
| @@ -13,7 +13,7 @@ import TestGyp
|
| import sys
|
|
|
| if sys.platform == 'win32':
|
| - test = TestGyp.TestGyp(formats=['ninja'])
|
| + test = TestGyp.TestGyp()
|
|
|
| CHDIR = 'linker-flags'
|
| test.run_gyp('safeseh.gyp', chdir=CHDIR)
|
| @@ -30,11 +30,17 @@ if sys.platform == 'win32':
|
| # the safe exception handling feature. If any modules were not
|
| # compatible with safe exception handling feature, the resulting image
|
| # will not contain a table of safe exception handlers.
|
| - if HasSafeExceptionHandlers('test_safeseh_default.exe'):
|
| + # However, the msvs IDE passes /SAFESEH to the linker by default, if
|
| + # ImageHasSafeExceptionHandlers is not set to false in the vcxproj file.
|
| + # We emulate this behavior in msvs_emulation.py, so 'test_safeseh_default'
|
| + # and 'test_safeseh_yes' are built identically.
|
| + if not HasSafeExceptionHandlers('test_safeseh_default.exe'):
|
| test.fail_test()
|
| if HasSafeExceptionHandlers('test_safeseh_no.exe'):
|
| test.fail_test()
|
| if not HasSafeExceptionHandlers('test_safeseh_yes.exe'):
|
| test.fail_test()
|
| + if HasSafeExceptionHandlers('test_safeseh_x64.exe'):
|
| + test.fail_test()
|
|
|
| test.pass_test()
|
|
|