Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1280)

Unified Diff: remoting/remoting.gyp

Issue 8599010: Setup JS unittests for Chromoting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move run_all_unittests.cc into chrome/test Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 7181001faa3fcd18b814a9f0e6be76a311c8121f..108654a089101fcfb4e7759582689d497200eb00 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -11,6 +11,17 @@
# is brand-dependent and is defined further down.
'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
+
+ # Variables for common_constants (used by JS unittests).
+ 'variables': {
+ 'version_py_path': '../chrome/tools/build/version.py',
+ 'version_path': '../chrome/VERSION',
+ },
+ 'version_py_path': '<(version_py_path)',
+ 'version_path': '<(version_path)',
+ 'version_full':
+ '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
+
'conditions': [
['OS=="mac"', {
'conditions': [
@@ -136,6 +147,12 @@
],
},
+ 'includes': [
+ # The common_constants target is needed for the JS unittests.
+ '../chrome/common_constants.gypi',
+ '../chrome/js_unittest_vars.gypi',
+ ],
+
'target_defaults': {
'defines': [
],
@@ -863,15 +880,23 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
+ 'common_constants',
'../media/media.gyp:media',
- '../ui/ui.gyp:ui',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../ui/ui.gyp:ui',
+ '../v8/tools/gyp/v8.gyp:v8',
],
'include_dirs': [
'../testing/gmock/include',
],
+ 'includes': [
+ '../chrome/js_unittest_rules.gypi',
+ ],
'sources': [
+ '../chrome/test/base/v8_unit_test.cc',
+ '../chrome/test/base/v8_unit_test.h',
+ '../chrome/test/run_all_unittests.cc',
'base/auth_token_util_unittest.cc',
'base/codec_test.cc',
'base/codec_test.h',
@@ -919,7 +944,8 @@
'protocol/protocol_mock_objects.h',
'protocol/rtp_video_reader_unittest.cc',
'protocol/rtp_video_writer_unittest.cc',
- 'run_all_unittests.cc',
+ 'webapp/me2mom/debug_log.gtestjs',
+ 'webapp/me2mom/debug_log.js',
],
'conditions': [
['toolkit_uses_gtk == 1', {

Powered by Google App Engine
This is Rietveld 408576698