| Index: test/win/gyptest-macro-targetfilename.py
|
| diff --git a/test/win/gyptest-macro-targetfilename.py b/test/win/gyptest-macro-targetfilename.py
|
| index 9b8a5c7bb4c9eacf635ac261644150c08d047bce..dd5d0d279936e233dad2792400dbb0fa2a7a41b5 100644
|
| --- a/test/win/gyptest-macro-targetfilename.py
|
| +++ b/test/win/gyptest-macro-targetfilename.py
|
| @@ -10,21 +10,23 @@ Make sure macro expansion of $(TargetFileName) is handled.
|
|
|
| import TestGyp
|
|
|
| +import os
|
| import sys
|
|
|
| if sys.platform == 'win32':
|
| test = TestGyp.TestGyp(formats=['msvs', 'ninja'])
|
| -
|
| - CHDIR = 'vs-macros'
|
| - test.run_gyp('targetfilename.gyp', chdir=CHDIR)
|
| - test.build('targetfilename.gyp', test.ALL, chdir=CHDIR)
|
| - test.built_file_must_exist('test_targetfilename_executable.exe', chdir=CHDIR)
|
| - test.built_file_must_exist('test_targetfilename_loadable_module.dll',
|
| - chdir=CHDIR)
|
| - test.built_file_must_exist('test_targetfilename_shared_library.dll',
|
| - chdir=CHDIR)
|
| - test.built_file_must_exist('test_targetfilename_static_library.lib',
|
| - chdir=CHDIR)
|
| - test.built_file_must_exist('test_targetfilename_product_extension.foo',
|
| - chdir=CHDIR)
|
| - test.pass_test()
|
| + if not (test.format == 'msvs' and
|
| + int(os.environ.get('GYP_MSVS_VERSION', 0)) == 2013):
|
| + CHDIR = 'vs-macros'
|
| + test.run_gyp('targetfilename.gyp', chdir=CHDIR)
|
| + test.build('targetfilename.gyp', test.ALL, chdir=CHDIR)
|
| + test.built_file_must_exist('test_targetfilename_executable.exe', chdir=CHDIR)
|
| + test.built_file_must_exist('test_targetfilename_loadable_module.dll',
|
| + chdir=CHDIR)
|
| + test.built_file_must_exist('test_targetfilename_shared_library.dll',
|
| + chdir=CHDIR)
|
| + test.built_file_must_exist('test_targetfilename_static_library.lib',
|
| + chdir=CHDIR)
|
| + test.built_file_must_exist('test_targetfilename_product_extension.foo',
|
| + chdir=CHDIR)
|
| + test.pass_test()
|
|
|