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

Side by Side Diff: remoting/remoting.gyp

Issue 8779002: Re-enable basic JS unittests for Chromoting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove old unittest runner Created 8 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/run_all_remoting_unittests.cc ('k') | remoting/run_all_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 10
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 ], 192 ],
193 'remoting_host_installer_win_roots': [ 193 'remoting_host_installer_win_roots': [
194 'host/installer/win/', 194 'host/installer/win/',
195 ], 195 ],
196 'remoting_host_installer_win_files': [ 196 'remoting_host_installer_win_files': [
197 'host/installer/win/chromoting.wxs', 197 'host/installer/win/chromoting.wxs',
198 'host/installer/win/parameters.json', 198 'host/installer/win/parameters.json',
199 ], 199 ],
200 }, 200 },
201 201
202 'includes': [
203 '../chrome/js_unittest_vars.gypi',
204 ],
205
202 'target_defaults': { 206 'target_defaults': {
203 'defines': [ 207 'defines': [
204 ], 208 ],
205 'include_dirs': [ 209 'include_dirs': [
206 '..', # Root of Chrome checkout 210 '..', # Root of Chrome checkout
207 ], 211 ],
208 'conditions': [ 212 'conditions': [
209 ['remoting_host_linux_clipboard != 0', { 213 ['remoting_host_linux_clipboard != 0', {
210 'defines': [ 214 'defines': [
211 'REMOTING_HOST_LINUX_CLIPBOARD', 215 'REMOTING_HOST_LINUX_CLIPBOARD',
(...skipping 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 '../testing/gtest.gyp:gtest', 1882 '../testing/gtest.gyp:gtest',
1879 '../ui/ui.gyp:ui', 1883 '../ui/ui.gyp:ui',
1880 ], 1884 ],
1881 'defines': [ 1885 'defines': [
1882 'VERSION=<(version_full)', 1886 'VERSION=<(version_full)',
1883 ], 1887 ],
1884 'include_dirs': [ 1888 'include_dirs': [
1885 '../testing/gmock/include', 1889 '../testing/gmock/include',
1886 ], 1890 ],
1887 'sources': [ 1891 'sources': [
1892 '../chrome/test/base/run_all_remoting_unittests.cc',
1888 'base/auth_token_util_unittest.cc', 1893 'base/auth_token_util_unittest.cc',
1889 'base/auto_thread_task_runner_unittest.cc', 1894 'base/auto_thread_task_runner_unittest.cc',
1890 'base/breakpad_win_unittest.cc', 1895 'base/breakpad_win_unittest.cc',
1891 'base/compound_buffer_unittest.cc', 1896 'base/compound_buffer_unittest.cc',
1892 'base/compressor_zlib_unittest.cc', 1897 'base/compressor_zlib_unittest.cc',
1893 'base/decompressor_zlib_unittest.cc', 1898 'base/decompressor_zlib_unittest.cc',
1894 'base/util_unittest.cc', 1899 'base/util_unittest.cc',
1895 'client/key_event_mapper_unittest.cc', 1900 'client/key_event_mapper_unittest.cc',
1896 'client/plugin/mac_key_event_processor_unittest.cc', 1901 'client/plugin/mac_key_event_processor_unittest.cc',
1897 'codec/codec_test.cc', 1902 'codec/codec_test.cc',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 'protocol/jingle_session_unittest.cc', 1959 'protocol/jingle_session_unittest.cc',
1955 'protocol/message_decoder_unittest.cc', 1960 'protocol/message_decoder_unittest.cc',
1956 'protocol/message_reader_unittest.cc', 1961 'protocol/message_reader_unittest.cc',
1957 'protocol/mouse_input_filter_unittest.cc', 1962 'protocol/mouse_input_filter_unittest.cc',
1958 'protocol/negotiating_authenticator_unittest.cc', 1963 'protocol/negotiating_authenticator_unittest.cc',
1959 'protocol/protocol_mock_objects.cc', 1964 'protocol/protocol_mock_objects.cc',
1960 'protocol/protocol_mock_objects.h', 1965 'protocol/protocol_mock_objects.h',
1961 'protocol/ppapi_module_stub.cc', 1966 'protocol/ppapi_module_stub.cc',
1962 'protocol/ssl_hmac_channel_authenticator_unittest.cc', 1967 'protocol/ssl_hmac_channel_authenticator_unittest.cc',
1963 'protocol/v2_authenticator_unittest.cc', 1968 'protocol/v2_authenticator_unittest.cc',
1964 'run_all_unittests.cc',
1965 ], 1969 ],
1966 'conditions': [ 1970 'conditions': [
1967 [ 'OS=="win"', { 1971 [ 'OS=="win"', {
1968 'include_dirs': [ 1972 'include_dirs': [
1969 '../breakpad/src', 1973 '../breakpad/src',
1970 ], 1974 ],
1971 'link_settings': { 1975 'link_settings': {
1972 'libraries': [ 1976 'libraries': [
1973 '-lrpcrt4.lib', 1977 '-lrpcrt4.lib',
1974 ], 1978 ],
1975 }, 1979 },
1980 }, { # else OS != "win"
1981 # Javascript unittests are disabled on Windows because they add a
1982 # dependency on 'common_constants' which (only on Windows) requires
1983 # additional dependencies:
1984 # '../content/content.gyp:content_common',
1985 # 'installer_util',
1986 # These targets are defined in .gypi files that would need to be
1987 # included here:
1988 # '../chrome/chrome_common.gypi',
1989 # '../chrome/chrome_installer.gypi',
1990 # '../chrome/chrome_installer_util.gypi',
1991 # But we can't do that because ninja will complain about multiple
1992 # target definitions.
1993 # TODO(garykac): Move installer_util into a proper .gyp file so that
1994 # it can be included in multiple .gyp files.
1995 'includes': [
1996 '../chrome/js_unittest_rules.gypi',
1997 ],
1998 'dependencies': [
1999 '../chrome/common_constants.gyp:common_constants',
2000 '../v8/tools/gyp/v8.gyp:v8',
2001 ],
2002 'sources': [
2003 '../chrome/test/base/v8_unit_test.cc',
2004 '../chrome/test/base/v8_unit_test.h',
2005 'webapp/format_iq.gtestjs',
2006 'webapp/format_iq.js',
2007 ],
1976 }], 2008 }],
1977 ['chromeos != 0', { 2009 ['chromeos != 0', {
1978 'dependencies!': [ 2010 'dependencies!': [
1979 'remoting_host', 2011 'remoting_host',
1980 ], 2012 ],
1981 'sources/': [ 2013 'sources/': [
1982 ['exclude', 'host/*'], 2014 ['exclude', 'host/*'],
1983 ] 2015 ]
1984 }], 2016 }],
1985 ['toolkit_uses_gtk == 1', { 2017 ['toolkit_uses_gtk == 1', {
1986 'dependencies': [ 2018 'dependencies': [
1987 # Needed for the following #include chain: 2019 # Needed for the following #include chain:
1988 # base/run_all_unittests.cc 2020 # base/run_all_unittests.cc
1989 # ../base/test_suite.h 2021 # ../base/test_suite.h
1990 # gtk/gtk.h 2022 # gtk/gtk.h
1991 '../build/linux/system.gyp:gtk', 2023 '../build/linux/system.gyp:gtk',
1992 '../build/linux/system.gyp:ssl', 2024 '../build/linux/system.gyp:ssl',
1993 ], 2025 ],
1994 'conditions': [ 2026 'conditions': [
1995 [ 'linux_use_tcmalloc==1', { 2027 [ 'linux_use_tcmalloc==1', {
1996 'dependencies': [ 2028 'dependencies': [
1997 '../base/allocator/allocator.gyp:allocator', 2029 '../base/allocator/allocator.gyp:allocator',
1998 ], 2030 ],
1999 }, 2031 },
2000 ], 2032 ],
2001 ], 2033 ],
2002 }], 2034 }], # end of 'toolkit_uses_gtk == 1'
2003 ], # end of 'conditions' 2035 ], # end of 'conditions'
2004 }, # end of target 'remoting_unittests' 2036 }, # end of target 'remoting_unittests'
2005 ], # end of targets 2037 ], # end of targets
2006 } 2038 }
OLDNEW
« no previous file with comments | « chrome/test/base/run_all_remoting_unittests.cc ('k') | remoting/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698