Re-enable basic JS unittests for Chromoting.

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index e32c64dda3fcf15cbb46794d2a19d85b4e52b415..4ba8385956fdd25c397c72c58e5ea4d65bbe28e3 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -25,6 +25,16 @@
         ],  # 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
@@ -141,6 +151,10 @@
     ],
   },
 
+  'includes': [
+    '../chrome/js_unittest_vars.gypi',
+  ],
+
   'target_defaults': {
     'defines': [
     ],
@@ -224,6 +238,12 @@
 
       ],  # end of 'targets'
     }],  # 'OS=="linux"'
+    ['OS == "mac"', {
+      'includes': [
+        # Required for JS unittests.
+        '../chrome/common_constants.gypi',
+      ],
+    }],  # 'OS == "mac"'
   ],  # end of 'conditions'
 
   'targets': [
@@ -883,11 +903,18 @@
         '../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',
@@ -943,7 +970,8 @@
         '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', {
@@ -963,7 +991,33 @@
               },
             ],
           ],
-        }],
+        }],  # 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