Skip to content

Commit

Permalink
Rename monochrome_apk_checker to monochrome_public_apk_checker
Browse files Browse the repository at this point in the history
This is in preparation for a new tester which tests Monochrome.apk

BUG=1115604

Change-Id: I8e817c1d4ae88c5b410aca502172f881c0864975
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460714
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815495}
  • Loading branch information
pkotwicz authored and Commit Bot committed Oct 9, 2020
1 parent 9ef99ad commit da2f111
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ group("gn_all") {
"//build/android/gyp/test:hello_world",
"//build/android/stacktrace:java_deobfuscate",
"//build/config/android/test/proto:test_build_protos",
"//chrome/android/monochrome:monochrome_apk_checker",
"//chrome/android/monochrome:monochrome_public_apk_checker",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
"//chrome/android/webapk/shell_apk:webapk",
"//chrome/android/webapk/shell_apk/prepare_upload_dir:prepare_webapk_shell_upload_dir",
Expand Down
2 changes: 1 addition & 1 deletion build/config/android/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2769,7 +2769,7 @@ if (enable_java_templates) {
sources = [ _resources_path_map_out_path ]
outputs = [ _final_pathmap_path ]

# The monochrome_apk_checker test needs pathmap when run on swarming.
# The monochrome_public_apk_checker test needs pathmap when run on swarming.
data = [ _final_pathmap_path ]
}
_final_deps += [ ":$_copy_pathmap_target" ]
Expand Down
2 changes: 1 addition & 1 deletion chrome/android/monochrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import("//build/config/android/config.gni")

group("monochrome_apk_checker") {
group("monochrome_public_apk_checker") {
testonly = true
data_deps = [
"//android_webview:system_webview_apk",
Expand Down
18 changes: 9 additions & 9 deletions testing/buildbot/chromium.android.json
Original file line number Diff line number Diff line change
Expand Up @@ -20401,12 +20401,12 @@
],
"isolated_scripts": [
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
Expand All @@ -20417,7 +20417,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
],
"junit_tests": [
Expand Down Expand Up @@ -33783,12 +33783,12 @@
"args": [
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
],
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
Expand All @@ -33813,7 +33813,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
]
},
Expand Down Expand Up @@ -37383,12 +37383,12 @@
"test_id_prefix": "ninja://content/shell:content_shell_crash_test/"
},
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
Expand All @@ -37401,7 +37401,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
},
{
"args": [
Expand Down
6 changes: 3 additions & 3 deletions testing/buildbot/chromium.clang.json
Original file line number Diff line number Diff line change
Expand Up @@ -8104,12 +8104,12 @@
],
"isolated_scripts": [
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
Expand All @@ -8120,7 +8120,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
],
"junit_tests": [
Expand Down
4 changes: 2 additions & 2 deletions testing/buildbot/gn_isolate_map.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@
"label": "//mojo:mojo_unittests",
"type": "console_test_launcher",
},
"monochrome_apk_checker": {
"monochrome_public_apk_checker": {
"args": [
"../../chrome/android/monochrome/scripts/monochrome_python_tests.py",
"--chrome-apk",
Expand All @@ -1263,7 +1263,7 @@
"--monochrome-pathmap",
"apks/MonochromePublic.apk.pathmap.txt",
],
"label": "//chrome/android/monochrome:monochrome_apk_checker",
"label": "//chrome/android/monochrome:monochrome_public_apk_checker",
"script": "//testing/scripts/run_isolated_script_test.py",
"type": "script",
},
Expand Down
2 changes: 1 addition & 1 deletion testing/buildbot/test_suite_exceptions.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,7 @@
},
},
},
'monochrome_apk_checker': {
'monochrome_public_apk_checker': {
'modifications': {
'ToTAndroid': {
'swarming': {
Expand Down
6 changes: 3 additions & 3 deletions testing/buildbot/test_suites.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -3502,8 +3502,8 @@
'services_unittests': {},
},

'monochrome_apk_checker_isolated_script': {
'monochrome_apk_checker': {},
'monochrome_public_apk_checker_isolated_script': {
'monochrome_public_apk_checker': {},
},

# These tests will be run on the main waterfall.
Expand Down Expand Up @@ -5506,7 +5506,7 @@
'marshmallow_nougat_pie_isolated_scripts_with_proguard': [
'android_isolated_scripts',
'components_perftests_isolated_scripts',
'monochrome_apk_checker_isolated_script',
'monochrome_public_apk_checker_isolated_script',
'telemetry_android_minidump_unittests_isolated_scripts',
'telemetry_perf_unittests_isolated_scripts',
],
Expand Down
4 changes: 2 additions & 2 deletions testing/buildbot/waterfalls.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@
'test_suites': {
'gtest_tests': 'android_lollipop_marshmallow_gtests',
'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script',
'isolated_scripts': 'monochrome_public_apk_checker_isolated_script',
},
'os_type': 'android',
},
Expand Down Expand Up @@ -1280,7 +1280,7 @@
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script',
'isolated_scripts': 'monochrome_public_apk_checker_isolated_script',
},
'os_type': 'android',
},
Expand Down

0 comments on commit da2f111

Please sign in to comment.