summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp6
-rwxr-xr-xbuild/android/adb_chrome_shell_command_line (renamed from build/android/adb_chromium_testshell_command_line)20
-rwxr-xr-xbuild/android/adb_gdb_chrome_shell (renamed from build/android/adb_gdb_chromium_testshell)6
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py10
-rwxr-xr-xbuild/android/buildbot/bb_run_bot.py4
-rw-r--r--build/android/lint/suppressions.xml6
-rw-r--r--build/android/pylib/constants.py8
-rw-r--r--build/android/pylib/utils/report_results.py2
-rwxr-xr-xbuild/android/test_runner.py8
9 files changed, 35 insertions, 35 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 7c04efde..9a07c4f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -49,7 +49,7 @@
'<@(android_app_targets)',
'android_builder_tests',
'../android_webview/android_webview.gyp:android_webview_apk',
- '../chrome/chrome.gyp:chromium_testshell',
+ '../chrome/chrome.gyp:chrome_shell_apk',
'../remoting/remoting.gyp:remoting_apk',
'../tools/telemetry/telemetry.gyp:*#host',
# TODO(nyquist) This should instead by a target for sync when all of
@@ -776,8 +776,8 @@
'../ui/events/events.gyp:events_unittests_apk',
'../ui/ui_unittests.gyp:ui_unittests_apk',
'../android_webview/android_webview.gyp:android_webview_test_apk',
- '../chrome/chrome.gyp:chromium_testshell_test_apk',
- '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests',
+ '../chrome/chrome.gyp:chrome_shell_test_apk',
+ '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
],
}],
diff --git a/build/android/adb_chromium_testshell_command_line b/build/android/adb_chrome_shell_command_line
index 8c09e3f..1e2bd38 100755
--- a/build/android/adb_chromium_testshell_command_line
+++ b/build/android/adb_chrome_shell_command_line
@@ -1,22 +1,22 @@
#!/bin/bash
#
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
-# If no flags are given, prints the current chromium test shell flags.
+# If no flags are given, prints the current chrome shell flags.
#
-# Otherwise, the given flags are used to REPLACE (not modify) the chromium
-# test shell flags. For example:
-# adb_chromium_testshell_command_line --enable-webgl
+# Otherwise, the given flags are used to REPLACE (not modify) the chrome shell
+# flags. For example:
+# adb_chrome_shell_command_line --enable-webgl
#
-# To remove all chromium test shell flags, pass an empty string for the flags:
-# adb_chromium_testshell_command_line ""
+# To remove all chrome shell flags, pass an empty string for the flags:
+# adb_chrome_shell_command_line ""
-CMD_LINE_FILE=/data/local/tmp/chromium-testshell-command-line
+CMD_LINE_FILE=/data/local/tmp/chrome-shell-command-line
if [ $# -eq 0 ] ; then
- # If nothing specified, print the command line (stripping off "chromium_testshell")
+ # If nothing specified, print the command line (stripping off "chrome_shell")
tempfile=$(tempfile)
adb pull $CMD_LINE_FILE $tempfile 2>/dev/null
if [ $? -eq 0 ] ; then
@@ -30,7 +30,7 @@ elif [ $# -eq 1 ] && [ "$1" = '' ] ; then
else
# Else set it.
set -x
- adb shell "echo 'chromium_testshell $*' > $CMD_LINE_FILE"
+ adb shell "echo 'chrome_shell $*' > $CMD_LINE_FILE"
# Prevent other apps from modifying flags -- this can create security issues.
adb shell chmod 0664 $CMD_LINE_FILE
fi
diff --git a/build/android/adb_gdb_chromium_testshell b/build/android/adb_gdb_chrome_shell
index 1334c9b..e5c8a30 100755
--- a/build/android/adb_gdb_chromium_testshell
+++ b/build/android/adb_gdb_chrome_shell
@@ -1,16 +1,16 @@
#!/bin/bash
#
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
#
-# Attach to or start a ChromiumTestShell process and debug it.
+# Attach to or start a ChromeShell process and debug it.
# See --help for details.
#
PROGDIR=$(dirname "$0")
export ADB_GDB_PROGNAME=$(basename "$0")
export ADB_GDB_ACTIVITY=.ChromeShellActivity
"$PROGDIR"/adb_gdb \
- --program-name=ChromiumTestShell \
+ --program-name=ChromeShell \
--package-name=org.chromium.chrome.shell \
"$@"
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index a93c0d7..c6e5f26 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -64,12 +64,12 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
'org.chromium.content_shell_apk',
'ContentShellTest',
'content:content/test/data/android/device_files'),
- I('ChromiumTestShell',
- 'ChromiumTestShell.apk',
+ I('ChromeShell',
+ 'ChromeShell.apk',
'org.chromium.chrome.shell',
- 'ChromiumTestShellTest',
+ 'ChromeShellTest',
'chrome:chrome/test/data/android/device_files',
- constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
+ constants.CHROME_SHELL_HOST_DRIVEN_DIR),
I('AndroidWebView',
'AndroidWebView.apk',
'org.chromium.android_webview.shell',
@@ -156,7 +156,7 @@ def RunChromeDriverTests(options):
bb_annotations.PrintNamedStep('chromedriver_annotation')
RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
'--android-packages=%s,%s,%s,%s' %
- ('chromium_test_shell',
+ ('chrome_shell',
'chrome_stable',
'chrome_beta',
'chromedriver_webview_shell'),
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py
index f208fb0..0d3d275 100755
--- a/build/android/buildbot/bb_run_bot.py
+++ b/build/android/buildbot/bb_run_bot.py
@@ -146,7 +146,7 @@ def GetBotStepMap():
T(std_tests, ['--asan', '--asan-symbolize'])),
B('blink-try-builder', H(compile_step)),
B('chromedriver-fyi-tests-dbg', H(std_test_steps),
- T(['chromedriver'], ['--install=ChromiumTestShell'])),
+ T(['chromedriver'], ['--install=ChromeShell'])),
B('fyi-x86-builder-dbg',
H(compile_step + std_host_tests, experimental, target_arch='x86')),
B('fyi-builder-dbg',
@@ -165,7 +165,7 @@ def GetBotStepMap():
# Pass empty T([]) so that logcat monitor and device status check are run.
B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression']), T([])),
B('perf-tests-rel', H(std_test_steps),
- T([], ['--install=ChromiumTestShell'])),
+ T([], ['--install=ChromeShell'])),
B('webkit-latest-webkit-tests', H(std_test_steps),
T(['webkit_layout', 'webkit'], ['--auto-reconnect'])),
B('webkit-latest-contentshell', H(compile_step),
diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
index 49383e5..a6b3f57 100644
--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
@@ -62,9 +62,9 @@ Still reading?
<ignore path="AndroidManifest.xml"/>
</issue>
<issue id="NewApi">
- <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest$6.class"/>
- <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest$7.class"/>
- <ignore path="PRODUCT_DIR/chromium_testshell_test_apk/classes/org/chromium/printing/PrintingControllerTest.class"/>
+ <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest$6.class"/>
+ <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest$7.class"/>
+ <ignore path="PRODUCT_DIR/chrome_shell_test_apk/classes/org/chromium/printing/PrintingControllerTest.class"/>
<ignore path="PRODUCT_DIR/content_shell_test_apk/classes/org/chromium/content/browser/ClipboardTest.class"/>
<ignore path="android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java"/>
<ignore path="android_webview/java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java"/>
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index 4e22892..53dba7b 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -15,7 +15,7 @@ DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
os.pardir, os.pardir, os.pardir))
ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')
-CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
+CHROME_SHELL_HOST_DRIVEN_DIR = os.path.join(
DIR_SOURCE_ROOT, 'chrome', 'android')
@@ -60,11 +60,11 @@ PACKAGE_INFO = {
'/data/local/tmp/content-shell-command-line',
None,
'org.chromium.content_shell_apk.tests'),
- 'chromium_test_shell': PackageInfo(
+ 'chrome_shell': PackageInfo(
'org.chromium.chrome.shell',
'org.chromium.chrome.shell.ChromeShellActivity',
- '/data/local/tmp/chromium-testshell-command-line',
- 'chromium_testshell_devtools_remote',
+ '/data/local/tmp/chrome-shell-command-line',
+ 'chrome_shell_devtools_remote',
'org.chromium.chrome.shell.tests'),
'android_webview_shell': PackageInfo(
'org.chromium.android_webview.shell',
diff --git a/build/android/pylib/utils/report_results.py b/build/android/pylib/utils/report_results.py
index 9b98cb4..cb8115f 100644
--- a/build/android/pylib/utils/report_results.py
+++ b/build/android/pylib/utils/report_results.py
@@ -47,7 +47,7 @@ def _LogToFlakinessDashboard(results, test_type, test_package,
try:
if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
assert test_package in ['ContentShellTest',
- 'ChromiumTestShellTest',
+ 'ChromeShellTest',
'AndroidWebViewTest']
dashboard_test_type = ('%s_instrumentation_tests' %
test_package.lower().rstrip('test'))
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 2221e45..335f166 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -210,7 +210,7 @@ def AddInstrumentationTestOptions(option_parser):
option_parser.usage = '%prog instrumentation [options]'
option_parser.commands_dict = {}
option_parser.example = ('%prog instrumentation '
- '--test-apk=ChromiumTestShellTest')
+ '--test-apk=ChromeShellTest')
AddJavaTestOptions(option_parser)
AddCommonOptions(option_parser)
@@ -296,8 +296,8 @@ def AddUIAutomatorTestOptions(option_parser):
option_parser.usage = '%prog uiautomator [options]'
option_parser.commands_dict = {}
option_parser.example = (
- '%prog uiautomator --test-jar=chromium_testshell_uiautomator_tests'
- ' --package=chromium_test_shell')
+ '%prog uiautomator --test-jar=chrome_shell_uiautomator_tests'
+ ' --package=chrome_shell')
option_parser.add_option(
'--package',
help=('Package under test. Possible values: %s' %
@@ -368,7 +368,7 @@ def AddMonkeyTestOptions(option_parser):
option_parser.usage = '%prog monkey [options]'
option_parser.commands_dict = {}
option_parser.example = (
- '%prog monkey --package=chromium_test_shell')
+ '%prog monkey --package=chrome_shell')
option_parser.add_option(
'--package',
generated by cgit v1.1 at 2025-05-10 08:55:39 +0000