Merge from Chromium at DEPS revision db3f05efe0f9HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermain

This commit was generated by merge_to_master.py.

Change-Id: I60d0e38401d2444cd8c029e28b930554938d39c7

1 files changed, 16 insertions, 14 deletions

diff --git a/test/win/gyptest-macro-targetfilename.py b/test/win/gyptest-macro-targetfilename.py
index 9b8a5c7b..dd5d0d27 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()