Index: remoting/remoting.gyp |
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp |
index e19ae074bf2f0f45409fae4226849eae598c25a7..2874dee453e391c3646c54d15b70ee51960e6db8 100644 |
--- a/remoting/remoting.gyp |
+++ b/remoting/remoting.gyp |
@@ -199,6 +199,10 @@ |
], |
}, |
+ 'includes': [ |
+ '../chrome/js_unittest_vars.gypi', |
+ ], |
+ |
'target_defaults': { |
'defines': [ |
], |
@@ -1885,6 +1889,7 @@ |
'../testing/gmock/include', |
], |
'sources': [ |
+ '../chrome/test/base/run_all_remoting_unittests.cc', |
'base/auth_token_util_unittest.cc', |
'base/auto_thread_task_runner_unittest.cc', |
'base/breakpad_win_unittest.cc', |
@@ -1961,7 +1966,6 @@ |
'protocol/ppapi_module_stub.cc', |
'protocol/ssl_hmac_channel_authenticator_unittest.cc', |
'protocol/v2_authenticator_unittest.cc', |
- 'run_all_unittests.cc', |
], |
'conditions': [ |
[ 'OS=="win"', { |
@@ -1973,6 +1977,34 @@ |
'-lrpcrt4.lib', |
], |
}, |
+ }, { # else OS != "win" |
+ # Javascript unittests are disabled on Windows because they add a |
+ # dependency on 'common_constants' which (only on Windows) requires |
+ # additional dependencies: |
+ # '../content/content.gyp:content_common', |
+ # 'installer_util', |
+ # These targets are defined in .gypi files that would need to be |
+ # included here: |
+ # '../chrome/chrome_common.gypi', |
+ # '../chrome/chrome_installer.gypi', |
+ # '../chrome/chrome_installer_util.gypi', |
+ # But we can't do that because ninja will complain about multiple |
+ # target definitions. |
+ # TODO(garykac): Move installer_util into a proper .gyp file so that |
+ # it can be included in multiple .gyp files. |
+ 'includes': [ |
+ '../chrome/js_unittest_rules.gypi', |
+ ], |
+ 'dependencies': [ |
+ '../chrome/common_constants.gyp:common_constants', |
+ '../v8/tools/gyp/v8.gyp:v8', |
+ ], |
+ 'sources': [ |
+ '../chrome/test/base/v8_unit_test.cc', |
+ '../chrome/test/base/v8_unit_test.h', |
+ 'webapp/format_iq.gtestjs', |
+ 'webapp/format_iq.js', |
+ ], |
}], |
['chromeos != 0', { |
'dependencies!': [ |
@@ -1999,7 +2031,7 @@ |
}, |
], |
], |
- }], |
+ }], # end of 'toolkit_uses_gtk == 1' |
], # end of 'conditions' |
}, # end of target 'remoting_unittests' |
], # end of targets |