Commit ca16cd0c authored by garykac@chromium.org's avatar garykac@chromium.org

revert remoting part of 112252

BUG=105934
TEST=make

Review URL: http://codereview.chromium.org/8749018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112287 0039d316-1c4b-4281-b951-d872f2087c98
parent bf603ea4
...@@ -12,16 +12,6 @@ ...@@ -12,16 +12,6 @@
'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
'host_plugin_description': 'Allow another user to access your computer securely over the Internet.', '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': [ 'conditions': [
['OS=="mac"', { ['OS=="mac"', {
'conditions': [ 'conditions': [
...@@ -149,12 +139,6 @@ ...@@ -149,12 +139,6 @@
], ],
}, },
'includes': [
# The common_constants target is needed for the JS unittests.
'../chrome/common_constants.gypi',
'../chrome/js_unittest_vars.gypi',
],
'target_defaults': { 'target_defaults': {
'defines': [ 'defines': [
], ],
...@@ -164,14 +148,6 @@ ...@@ -164,14 +148,6 @@
}, },
'conditions': [ 'conditions': [
['OS == "win"', {
'includes': [
# Required for JS unittests.
'../chrome/chrome_common.gypi',
'../chrome/chrome_installer.gypi',
'../chrome/chrome_installer_util.gypi',
],
}], # 'OS == "win"'
['os_posix == 1', { ['os_posix == 1', {
'targets': [ 'targets': [
# Simple webserver for testing remoting client plugin. # Simple webserver for testing remoting client plugin.
...@@ -890,7 +866,6 @@ ...@@ -890,7 +866,6 @@
'target_name': 'remoting_unittests', 'target_name': 'remoting_unittests',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'common_constants', # from common_constants.gypi
'remoting_base', 'remoting_base',
'remoting_client', 'remoting_client',
'remoting_host', 'remoting_host',
...@@ -903,18 +878,11 @@ ...@@ -903,18 +878,11 @@
'../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui', '../ui/ui.gyp:ui',
'../v8/tools/gyp/v8.gyp:v8',
], ],
'include_dirs': [ 'include_dirs': [
'../testing/gmock/include', '../testing/gmock/include',
], ],
'includes': [
'../chrome/js_unittest_rules.gypi',
],
'sources': [ 'sources': [
'../chrome/test/base/v8_unit_test.cc',
'../chrome/test/base/v8_unit_test.h',
'../chrome/test/base/run_all_remoting_unittests.cc',
'base/auth_token_util_unittest.cc', 'base/auth_token_util_unittest.cc',
'base/codec_test.cc', 'base/codec_test.cc',
'base/codec_test.h', 'base/codec_test.h',
...@@ -964,8 +932,7 @@ ...@@ -964,8 +932,7 @@
'protocol/rtp_video_reader_unittest.cc', 'protocol/rtp_video_reader_unittest.cc',
'protocol/rtp_video_writer_unittest.cc', 'protocol/rtp_video_writer_unittest.cc',
'protocol/v1_authenticator_unittest.cc', 'protocol/v1_authenticator_unittest.cc',
'webapp/me2mom/debug_log.gtestjs', 'run_all_unittests.cc',
'webapp/me2mom/debug_log.js',
], ],
'conditions': [ 'conditions': [
['toolkit_uses_gtk == 1', { ['toolkit_uses_gtk == 1', {
...@@ -986,12 +953,6 @@ ...@@ -986,12 +953,6 @@
], ],
], ],
}], }],
['OS == "win"', {
'dependencies': [
# Required for JS unittests.
'installer_util',
],
}], # 'OS == "win"'
], # end of 'conditions' ], # end of 'conditions'
}, # end of target 'remoting_unittests' }, # end of target 'remoting_unittests'
], # end of targets ], # end of targets
......
// 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.
#include "base/test/test_suite.h"
int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);
return test_suite.Run();
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment