diff options
| -rw-r--r-- | build/all.gyp | 10 | ||||
| -rw-r--r-- | build/common.gypi | 10 | ||||
| -rwxr-xr-x | chrome/chrome_tests.gypi | 1 | ||||
| -rw-r--r-- | remoting/remoting.gyp (renamed from remoting/chromoting.gyp) | 4 | ||||
| -rwxr-xr-x | tools/heapcheck/chrome_tests.py | 4 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 4 | ||||
| -rwxr-xr-x | tools/wine_valgrind/chrome_tests.sh | 3 |
7 files changed, 26 insertions, 10 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'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 8c89f7df..209de2a 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2410,6 +2410,7 @@ 'nacl_ui_tests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', # ui_tests seem unhappy on both Mac and Win when run under # coverage (all tests fail, often with a # "server_->WaitForInitialLoads()"). TODO(jrg): diff --git a/remoting/chromoting.gyp b/remoting/remoting.gyp index 1084656..890f142 100644 --- a/remoting/chromoting.gyp +++ b/remoting/remoting.gyp @@ -308,9 +308,9 @@ ], }, # end of target 'chromoting_jingle_test_client' - # Chromoting unit tests + # Remoting unit tests { - 'target_name': 'chromoting_unittests', + 'target_name': 'remoting_unittests', 'type': 'executable', 'dependencies': [ 'chromoting_base', diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index fbc4174..23c8e06 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -87,6 +87,7 @@ class ChromeTests(object): "media": self.TestMedia, "media_unittests": self.TestMedia, "net": self.TestNet, "net_unittests": self.TestNet, "printing": self.TestPrinting, "printing_unittests": self.TestPrinting, + "remoting": self.TestRemoting, "remoting_unittests": self.TestRemoting, "startup": self.TestStartup, "startup_tests": self.TestStartup, "test_shell": self.TestTestShell, "test_shell_tests": self.TestTestShell, "ui": self.TestUI, "ui_tests": self.TestUI, @@ -254,6 +255,9 @@ class ChromeTests(object): def TestPrinting(self): return self.SimpleTest("chrome", "printing_unittests") + def TestRemoting(self): + return self.SimpleTest("chrome", "remoting_unittests") + def TestIpc(self): return self.SimpleTest("ipc", "ipc_tests") diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 756caf3..f30c822 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -235,6 +235,9 @@ class ChromeTests: def TestPrinting(self): return self.SimpleTest("chrome", "printing_unittests") + def TestRemoting(self): + return self.SimpleTest("chrome", "remoting_unittests") + def TestIpc(self): return self.SimpleTest("ipc", "ipc_tests", valgrind_test_args=["--trace_children"]) @@ -388,6 +391,7 @@ class ChromeTests: "media": TestMedia, "media_unittests": TestMedia, "net": TestNet, "net_unittests": TestNet, "printing": TestPrinting, "printing_unittests": TestPrinting, + "remoting": TestRemoting, "remoting_unittests": TestRemoting, "startup": TestStartup, "startup_tests": TestStartup, "sync": TestSync, "sync_unit_tests": TestSync, "test_shell": TestTestShell, "test_shell_tests": TestTestShell, diff --git a/tools/wine_valgrind/chrome_tests.sh b/tools/wine_valgrind/chrome_tests.sh index bed3222..990e0a5 100755 --- a/tools/wine_valgrind/chrome_tests.sh +++ b/tools/wine_valgrind/chrome_tests.sh @@ -62,7 +62,7 @@ _EOF_ # Tests, grouped by how long they take to run # Skip ones that require chrome itself for the moment -SUITES_1="googleurl_unittests printing_unittests sbox_validation_tests setup_unittests" +SUITES_1="googleurl_unittests printing_unittests remoting_unittests sbox_validation_tests setup_unittests" #SUITES_10="app_unittests courgette_unittests ipc_tests reliability_tests sbox_integration_tests sbox_unittests tab_switching_test tcmalloc_unittests url_fetch_test" SUITES_10="app_unittests courgette_unittests ipc_tests sbox_unittests tcmalloc_unittests" #SUITES_100="automated_ui_tests installer_util_unittests media_unittests nacl_ui_tests net_perftests net_unittests plugin_tests sync_unit_tests" @@ -209,6 +209,7 @@ get_expected_runtime() { media_unittests) echo 400;; net_unittests) echo 2000;; printing_unittests) echo 100;; + remoting_unittests) echo 200;; sbox_unittests) echo 100;; sbox_validation_tests) echo 100;; setup_unittests) echo 100;; |