diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 23:08:17 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 23:08:17 +0000 |
| commit | 542bf24a69172067524bee43954955fd5b6d2341 (patch) | |
| tree | f13e99c1861a8097ddeafc3c500ea037cdc42015 /build | |
| parent | e09b39da942e19d4becad8f9c7aadc206385b58b (diff) | |
| download | chromium_src-542bf24a69172067524bee43954955fd5b6d2341.zip chromium_src-542bf24a69172067524bee43954955fd5b6d2341.tar.gz chromium_src-542bf24a69172067524bee43954955fd5b6d2341.tar.bz2 | |
Enable remoting unittests to run on build bots
Renamed chromoting.gyp to remoting.gyp.
Also enabled remoting_unittests to be executed on the build bots.
Review URL: http://codereview.chromium.org/2720007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 10 | ||||
| -rw-r--r-- | build/common.gypi | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/build/all.gyp b/build/all.gyp index d63aee7..8473820 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -125,9 +125,9 @@ '../chrome/browser/chromeos/text_input/text_input.gyp:*', ], }], - ['chromoting==1', { + ['remoting==1', { 'dependencies': [ - '../remoting/chromoting.gyp:*', + '../remoting/remoting.gyp:*', ], }], ], @@ -158,6 +158,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:notifier_unit_tests', @@ -190,6 +191,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', ], @@ -205,6 +207,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', ], }, @@ -245,6 +248,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin', # TODO(nsylvain) ui_tests.exe depends on test_shell_common. @@ -280,6 +284,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -320,6 +325,7 @@ '../media/media.gyp:omx_test', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', '../chrome/browser/chromeos/text_input/text_input.gyp:candidate_window', diff --git a/build/common.gypi b/build/common.gypi index dcafee7..e449de0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -112,8 +112,8 @@ # On Linux, we build with sse2 for Chromium builds. 'disable_sse2%': 0, - # Chromoting compilation is enabled by default. Set to 0 to disable. - 'chromoting%': 1, + # Remoting compilation is enabled by default. Set to 0 to disable. + 'remoting%': 1, }, # Define branding and buildtype on the basis of their settings within the @@ -132,7 +132,7 @@ 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', 'disable_sse2%': '<(disable_sse2)', - 'chromoting%': '<(chromoting)', + 'remoting%': '<(remoting)', # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. @@ -410,8 +410,8 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], - ['chromoting==1', { - 'defines': ['ENABLE_CHROMOTING=1'], + ['remoting==1', { + 'defines': ['ENABLE_REMOTING=1'], }], ['proprietary_codecs==1', { 'defines': ['USE_PROPRIETARY_CODECS'], |