diff options
| author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 01:31:26 +0000 |
|---|---|---|
| committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 01:31:26 +0000 |
| commit | efeb59e66b1e367a30746a855e3abbeb0958f90b (patch) | |
| tree | 6c2c57b1043be70cdef49157263da426a547e214 /chrome/test | |
| parent | 744178a15835a50f91d5f0bd656632bfa79db54d (diff) | |
| download | chromium_src-efeb59e66b1e367a30746a855e3abbeb0958f90b.zip chromium_src-efeb59e66b1e367a30746a855e3abbeb0958f90b.tar.gz chromium_src-efeb59e66b1e367a30746a855e3abbeb0958f90b.tar.bz2 | |
Rename chromium_testshell target to chrome_shell_apk.
Final rename of ChromiumTestShell to ChromeShell.
Now the new targets to build ChromeShell and ChromeShellTest APKs will be:
chrome_shell_apk
chrome_shell_test_apk
This will better align with ContentShell and ContentShellTest APKs' targets:
content_shell_apk
content_shell_test_apk
BUG=348137
TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/189133005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/chromedriver/chrome/device_manager.cc | 6 | ||||
| -rwxr-xr-x | chrome/test/chromedriver/test/run_py_tests.py | 6 | ||||
| -rw-r--r-- | chrome/test/chromedriver/test/test_expectations | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/chromedriver/chrome/device_manager.cc b/chrome/test/chromedriver/chrome/device_manager.cc index 6493231..8bedee4 100644 --- a/chrome/test/chromedriver/chrome/device_manager.cc +++ b/chrome/test/chromedriver/chrome/device_manager.cc @@ -58,9 +58,9 @@ Status Device::SetUp(const std::string& package, } else if (package.compare("org.chromium.chrome.shell") == 0) { // ChromeShell known_activity = ".ChromeShellActivity"; - device_socket = "chromium_testshell_devtools_remote"; - command_line_file = "/data/local/tmp/chromium-testshell-command-line"; - exec_name = "chromium_testshell"; + device_socket = "chrome_shell_devtools_remote"; + command_line_file = "/data/local/tmp/chrome-shell-command-line"; + exec_name = "chrome_shell"; } else if (package.find("chrome") != std::string::npos && package.find("webview") == std::string::npos) { // Chrome. diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py index 111fea6..48083b2 100755 --- a/chrome/test/chromedriver/test/run_py_tests.py +++ b/chrome/test/chromedriver/test/run_py_tests.py @@ -121,16 +121,16 @@ _ANDROID_NEGATIVE_FILTER['chrome_stable'] = ( _ANDROID_NEGATIVE_FILTER['chrome']) _ANDROID_NEGATIVE_FILTER['chrome_beta'] = ( _ANDROID_NEGATIVE_FILTER['chrome']) -_ANDROID_NEGATIVE_FILTER['chromium_test_shell'] = ( +_ANDROID_NEGATIVE_FILTER['chrome_shell'] = ( _ANDROID_NEGATIVE_FILTER['chrome'] + [ - # ChromiumTestShell doesn't support multiple tabs. + # ChromeShell doesn't support multiple tabs. 'ChromeDriverTest.testGetWindowHandles', 'ChromeDriverTest.testSwitchToWindow', 'ChromeDriverTest.testShouldHandleNewWindowLoadingProperly', ] ) _ANDROID_NEGATIVE_FILTER['chromedriver_webview_shell'] = ( - _ANDROID_NEGATIVE_FILTER['chromium_test_shell']) + _ANDROID_NEGATIVE_FILTER['chrome_shell']) class ChromeDriverBaseTest(unittest.TestCase): diff --git a/chrome/test/chromedriver/test/test_expectations b/chrome/test/chromedriver/test/test_expectations index 8c05db0..1e2803f 100644 --- a/chrome/test/chromedriver/test/test_expectations +++ b/chrome/test/chromedriver/test/test_expectations @@ -185,7 +185,7 @@ _OS_NEGATIVE_FILTER['android:chrome_stable'] = ( _OS_NEGATIVE_FILTER['android:chrome']) _OS_NEGATIVE_FILTER['android:chrome_beta'] = ( _OS_NEGATIVE_FILTER['android:chrome']) -_OS_NEGATIVE_FILTER['android:chromium_test_shell'] = ( +_OS_NEGATIVE_FILTER['android:chrome_shell'] = ( _OS_NEGATIVE_FILTER['android:chrome']) _OS_NEGATIVE_FILTER['android:chromedriver_webview_shell'] = ( _OS_NEGATIVE_FILTER['android:chrome'] + [ |