Re-enable basic JS unittests for Chromoting.

remoting/remoting.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     # Use consistent strings across all platforms. Note that the plugin name
     # 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.',
 
     'conditions': [
       ['OS=="mac"', {
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
           }],  # branding
         ],  # conditions
         'host_plugin_extension': 'plugin',
         'host_plugin_prefix': '',
+
+        # Variables for common_constants target (used by JS unittests).
+        'variables': {
+          'version_py_path': '../chrome/tools/build/version.py',
+          'version_path': '../chrome/VERSION',
+        },
+        'version_py_path': '<(version_py_path)',

[Mark Mentovai, 2011/12/19 16:13:37]

I don’t think version_py_path and version_path are needed in this scope, unless
they’re needed by some included file.

[garykac, 2012/01/04 21:04:45]

They're needed by common_constants.gypi (included below).

+        'version_path': '<(version_path)',
+        'version_full':
+          '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', {
         # linux 32 bit
         'host_plugin_extension': 'ia32.so',
         'host_plugin_prefix': 'lib',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "x64"', {
         # linux 64 bit
         'host_plugin_extension': 'x64.so',
         'host_plugin_prefix': 'lib',
@@ skipping 96 matching lines @@
       'webapp/me2mom/util.js',
       'webapp/me2mom/wcs.js',
       'webapp/me2mom/wcs_loader.js',
       'webapp/me2mom/xhr.js',
       'resources/chromoting16.png',
       'resources/chromoting48.png',
       'resources/chromoting128.png',
     ],
   },
 
+  'includes': [
+    '../chrome/js_unittest_vars.gypi',
+  ],
+
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
   },
 
   'conditions': [
     ['os_posix == 1', {
@@ skipping 63 matching lines @@
             # and Continue windows for the Me2Me case - crbug.com/104377.
             'host/continue_window.h',
             'host/continue_window_linux.cc',
             'host/disconnect_window_linux.cc',
             'host/remoting_me2me_host.cc',
           ],
         },  # end of target 'remoting_me2me_host'
 
       ],  # end of 'targets'
     }],  # 'OS=="linux"'
+    ['OS == "mac"', {
+      'includes': [
+        # Required for JS unittests.
+        '../chrome/common_constants.gypi',
+      ],
+    }],  # 'OS == "mac"'
   ],  # end of 'conditions'
 
   'targets': [
     {
       'target_name': 'remoting_client_plugin',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'HAVE_STDINT_H',  # Required by on2_integer.h
       ],
@@ skipping 639 matching lines @@
         'remoting_host',
         'remoting_jingle_glue',
         'remoting_protocol',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../media/media.gyp:media',
         '../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': [
+        '<(DEPTH)/chrome/test/base/run_all_remoting_unittests.cc',

[Mark Mentovai, 2011/12/19 16:13:37]

Can you just write the right number of dots here instead of using <(DEPTH)?

[garykac, 2012/01/04 21:04:45]

Yes.

But the <(DEPTH) option was added to avoid hard-coding directory depth and seems
like the better choice.

+        '<(DEPTH)/chrome/test/base/v8_unit_test.cc',
+        '<(DEPTH)/chrome/test/base/v8_unit_test.h',
         'base/auth_token_util_unittest.cc',
         'base/codec_test.cc',
         'base/codec_test.h',
         'base/compound_buffer_unittest.cc',
         'base/compressor_zlib_unittest.cc',
         'base/decoder_vp8_unittest.cc',
         'base/decompressor_zlib_unittest.cc',
         'base/encode_decode_unittest.cc',
         'base/encoder_vp8_unittest.cc',
         'base/encoder_row_based_unittest.cc',
@@ skipping 35 matching lines @@
         'protocol/fake_session.h',
         'protocol/jingle_messages_unittest.cc',
         'protocol/jingle_session_unittest.cc',
         'protocol/message_decoder_unittest.cc',
         'protocol/message_reader_unittest.cc',
         'protocol/protocol_mock_objects.cc',
         'protocol/protocol_mock_objects.h',
         'protocol/rtp_video_reader_unittest.cc',
         'protocol/rtp_video_writer_unittest.cc',
         'protocol/v1_authenticator_unittest.cc',
-        'run_all_unittests.cc',
+        'webapp/me2mom/debug_log.gtestjs',
+        'webapp/me2mom/debug_log.js',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
             #   ../base/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:ssl',
           ],
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
-        }],
+        }],  # end of 'toolkit_uses_gtk == 1'
+        ['OS == "mac"', {
+          'dependencies': [
+            # This dependency is required for the JS unittests.
+            # Mac can't refer to the common_constants target directly from
+            # chrome.gyp because this will cause the circular dependency
+            # check to fail.
+            # So we need to include the common_constants.gypi file (above) and
+            # refer to it as a local target.
+            # Note that we can't do this for all platforms because it breaks
+            # the (linux) ninja builds ('target defined twice').
+            'common_constants',
+          ],
+        }, {  # else: 'OS != "mac"'
+          'dependencies': [
+            # This dependency is required for the JS unittests.
+            # Ideally, we'd refer to the target dependency like this for all
+            # platforms, but see the notes above for issues with the Mac build.
+            '../chrome/chrome.gyp:common_constants',
+          ],
+        }],  # end of 'OS == "mac"'
+        ['OS == "win"', {
+          'dependencies': [
+            # Required for JS unittests.
+            '../chrome/chrome.gyp:installer_util',
+          ],
+        }],  # end of 'OS == "win"'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }