Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json |
diff --git a/scripts/slave/recipes/android/appurify.expected/EXAMPLE_android_amp_builder_tester_basic.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json |
similarity index 71% |
copy from scripts/slave/recipes/android/appurify.expected/EXAMPLE_android_amp_builder_tester_basic.json |
copy to scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json |
index ee98c38c64dfa972d146a725906edc83870f4ef2..86539489dbfbcbcd7e7750787335d33e4b6f86ab 100644 |
--- a/scripts/slave/recipes/android/appurify.expected/EXAMPLE_android_amp_builder_tester_basic.json |
+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json |
@@ -5,13 +5,13 @@ |
"-u", |
"[BUILD]/scripts/slave/bot_update.py", |
"--master", |
- "chromium.linux", |
+ "chromium.fyi", |
"--builder", |
- "EXAMPLE_android_amp_builder_tester", |
+ "Android Tests (amp split)", |
"--slave", |
- "slavename", |
+ "build1-a1", |
"--spec", |
- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']", |
"--root", |
"src", |
"--revision_mapping_file", |
@@ -19,7 +19,7 @@ |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
- "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00" |
+ "src@HEAD" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "bot_update", |
@@ -65,6 +65,68 @@ |
"cmd": [ |
"python", |
"-u", |
+ "[DEPOT_TOOLS]/gclient.py", |
+ "runhooks" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "GYP_CROSSCOMPILE": "1", |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "gclient runhooks" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "read test spec", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@", |
+ "@@@STEP_LOG_LINE@json.output@{}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", |
+ "--output", |
+ "/path/to/tmp/json", |
+ "--", |
+ "--build-config-fs", |
+ "Release", |
+ "--paths", |
+ "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}", |
+ "--properties", |
+ "{\"buildername\": \"Android Tests (amp split)\", \"buildnumber\": \"77457\", \"mastername\": \"chromium.fyi\", \"slavename\": \"build1-a1\", \"target_platform\": \"android\"}" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "get compile targets for scripts", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILD]/scripts/slave/cleanup_temp.py" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "cleanup_temp" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
"[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
"[SLAVE_BUILD]/src/out/Release/test_logs", |
@@ -90,21 +152,6 @@ |
] |
}, |
{ |
- "cmd": [ |
- "python", |
- "-u", |
- "[DEPOT_TOOLS]/gclient.py", |
- "runhooks" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "gclient runhooks" |
- }, |
- { |
"allow_subannotations": false, |
"cmd": [ |
"[SLAVE_BUILD]/src/build/tree_truth.sh", |
@@ -115,98 +162,180 @@ |
"name": "tree truth steps" |
}, |
{ |
- "allow_subannotations": false, |
"cmd": [ |
- "[SLAVE_BUILD]/src/build/tree_truth.sh", |
- "[SLAVE_BUILD]/src", |
- "src" |
+ "python", |
+ "-u", |
+ "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
+ "[SLAVE_BUILD]/src/out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "tree truth steps (2)" |
+ "name": "rmtree build directory", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/slave/compile.py", |
+ "[BUILD]/scripts/slave/extract_build.py", |
"--target", |
"Release", |
- "--src-dir", |
- "[SLAVE_BUILD]/src", |
- "--build-tool", |
- "ninja", |
- "--compiler", |
- "goma", |
- "--goma-dir", |
- "[BUILD]/goma", |
- "--" |
+ "--build-archive-url", |
+ "gs://test-domain/test-archive.zip", |
+ "--factory-properties", |
+ "{\"buildername\": \"Android Tests (amp split)\", \"buildnumber\": \"77457\", \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"recipe\": \"chromium\", \"slavename\": \"build1-a1\"}", |
+ "--build-properties", |
+ "{\"buildername\": \"Android Tests (amp split)\", \"buildnumber\": \"77457\", \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"recipe\": \"chromium\", \"slavename\": \"build1-a1\"}" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "extract build" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[adb]/resources/list_devices.py", |
+ "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "List adb devices", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@[@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@]@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "014E1F310401C009" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Root devices", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'root'])@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[BUILD]/scripts/slave/daemonizer.py", |
+ "--", |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", |
+ "[SLAVE_BUILD]/src/out/logcat" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
- "name": "compile" |
+ "name": "spawn_logcat_monitor" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "android_webview_unittests", |
- "--enable-platform-mode", |
- "-e", |
- "remote_device", |
- "--api-key-file", |
- "[BUILD]/site_config/.amp_api_key", |
- "--api-secret-file", |
- "[BUILD]/site_config/.amp_api_secret", |
- "--api-address", |
- "172.22.21.180", |
- "--api-port", |
- "80", |
- "--api-protocol", |
- "http", |
- "--device-type", |
- "Android", |
- "--remote-device", |
- "Nexus 5", |
- "--remote-device-os", |
- "4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
- "--trigger", |
- "/path/to/tmp/json", |
- "--verbose", |
- "--release" |
+ "[BUILD]/scripts/slave/android/authorize_adb_devices.py", |
+ "--adb-path", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] android_webview_unittests", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "authorize_adb_devices" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", |
+ "--json-output", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "device_status_check", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"device\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"brand\": \"Foo\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Fone\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os_version\": \"1.2.3\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_TEXT@Online devices: 1@@@", |
+ "@@@STEP_LOG_LINE@json.output@[@@@", |
+ "@@@STEP_LOG_LINE@json.output@ {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"build\": \"LRX21O\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"type\": \"flo\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
+ "@@@STEP_LOG_LINE@json.output@]@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@{@@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"battery\": {@@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"AC powered\": \"false\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"USB powered\": \"true\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"Wireless powered\": \"false\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"health\": \"2\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"level\": \"100\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"present\": \"true\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"scale\": \"100\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"status\": \"5\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"technology\": \"Li-ion\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"temperature\": \"249\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"voltage\": \"4286\"@@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ }, @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build\": \"LRX21O\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"imei_slice\": \"Unknown\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"serial\": \"07a00ca4\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"type\": \"flo\", @@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"wifi_ip\": \"\"@@@", |
+ "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@}@@@", |
+ "@@@STEP_LOG_END@flo LRX21O 07a00ca4@@@" |
] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json" |
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py", |
+ "-t", |
+ "Release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save android_webview_unittests data" |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "provision_devices" |
}, |
{ |
"cmd": [ |
@@ -215,9 +344,7 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "base_unittests", |
- "--isolate-file-path", |
- "[SLAVE_BUILD]/src/base/base_unittests.isolate", |
+ "android_webview_unittests", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -237,15 +364,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] base_unittests", |
+ "name": "[trigger] android_webview_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -266,10 +391,10 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json" |
+ "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save base_unittests data" |
+ "name": "[trigger] save android_webview_unittests data" |
}, |
{ |
"cmd": [ |
@@ -278,7 +403,9 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "cc_unittests", |
+ "base_unittests", |
+ "--isolate-file-path", |
+ "[SLAVE_BUILD]/src/base/base_unittests.isolate", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -298,15 +425,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] cc_unittests", |
+ "name": "[trigger] base_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -327,10 +452,10 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/cc_unittests.json" |
+ "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save cc_unittests data" |
+ "name": "[trigger] save base_unittests data" |
}, |
{ |
"cmd": [ |
@@ -361,8 +486,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
@@ -422,8 +545,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
@@ -483,8 +604,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
@@ -544,8 +663,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
@@ -585,7 +702,9 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "skia_unittests", |
+ "sql_unittests", |
+ "--isolate-file-path", |
+ "[SLAVE_BUILD]/src/sql/sql_unittests.isolate", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -605,15 +724,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] skia_unittests", |
+ "name": "[trigger] sql_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -634,10 +751,10 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/skia_unittests.json" |
+ "[TMP_BASE]/amp_trigger_tmp_1/sql_unittests.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save skia_unittests data" |
+ "name": "[trigger] save sql_unittests data" |
}, |
{ |
"cmd": [ |
@@ -646,9 +763,9 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "sql_unittests", |
+ "sync_unit_tests", |
"--isolate-file-path", |
- "[SLAVE_BUILD]/src/sql/sql_unittests.isolate", |
+ "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -668,15 +785,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] sql_unittests", |
+ "name": "[trigger] sync_unit_tests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -697,10 +812,10 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/sql_unittests.json" |
+ "[TMP_BASE]/amp_trigger_tmp_1/sync_unit_tests.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save sql_unittests data" |
+ "name": "[trigger] save sync_unit_tests data" |
}, |
{ |
"cmd": [ |
@@ -709,9 +824,7 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "sync_unit_tests", |
- "--isolate-file-path", |
- "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate", |
+ "ui_android_unittests", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -731,15 +844,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] sync_unit_tests", |
+ "name": "[trigger] ui_android_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -760,10 +871,10 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/sync_unit_tests.json" |
+ "[TMP_BASE]/amp_trigger_tmp_1/ui_android_unittests.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save sync_unit_tests data" |
+ "name": "[trigger] save ui_android_unittests data" |
}, |
{ |
"cmd": [ |
@@ -772,7 +883,7 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "ui_android_unittests", |
+ "ui_touch_selection_unittests", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -792,15 +903,13 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--trigger", |
"/path/to/tmp/json", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] ui_android_unittests", |
+ "name": "[trigger] ui_touch_selection_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -819,12 +928,283 @@ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/ui_android_unittests.json" |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
+ "[TMP_BASE]/amp_trigger_tmp_1/ui_touch_selection_unittests.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "[trigger] save ui_touch_selection_unittests data" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
+ "--apk", |
+ "AndroidWebView.apk", |
+ "--apk_package", |
+ "org.chromium.android_webview.shell", |
+ "--release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "install AndroidWebView.apk" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "instrumentation", |
+ "--test-apk", |
+ "AndroidWebViewTest", |
+ "--isolate-file-path", |
+ "android_webview/android_webview_test_apk.isolate", |
+ "--flakiness-dashboard-server", |
+ "http://test-results.appspot.com", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Instrumentation test AndroidWebViewTest", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
+ "--apk", |
+ "ChromeShell.apk", |
+ "--apk_package", |
+ "org.chromium.chrome.shell", |
+ "--release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "install ChromeShell.apk" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "instrumentation", |
+ "--test-apk", |
+ "ChromeShellTest", |
+ "--isolate-file-path", |
+ "chrome/chrome_shell_test_apk.isolate", |
+ "--flakiness-dashboard-server", |
+ "http://test-results.appspot.com", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Instrumentation test ChromeShellTest", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
+ "--apk", |
+ "ContentShell.apk", |
+ "--apk_package", |
+ "org.chromium.content_shell_apk", |
+ "--release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "install ContentShell.apk" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "instrumentation", |
+ "--test-apk", |
+ "ContentShellTest", |
+ "--isolate-file-path", |
+ "content/content_shell_test_apk.isolate", |
+ "--flakiness-dashboard-server", |
+ "http://test-results.appspot.com", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Instrumentation test ContentShellTest", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
+ "--apk", |
+ "ChromeSyncShell.apk", |
+ "--apk_package", |
+ "org.chromium.chrome.browser.sync", |
+ "--release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "install ChromeSyncShell.apk" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "instrumentation", |
+ "--test-apk", |
+ "ChromeSyncShellTest", |
+ "--flakiness-dashboard-server", |
+ "http://test-results.appspot.com", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Instrumentation test ChromeSyncShellTest", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "breakpad_unittests", |
+ "--verbose", |
+ "--release", |
+ "--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "breakpad_unittests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "cc_unittests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "cc_unittests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "content_browsertests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "content_browsertests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "content_unittests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "content_unittests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "gpu_unittests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "gpu_unittests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "media_unittests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save ui_android_unittests data" |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "media_unittests" |
}, |
{ |
"cmd": [ |
@@ -833,130 +1213,121 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "ui_touch_selection_unittests", |
- "--enable-platform-mode", |
- "-e", |
- "remote_device", |
- "--api-key-file", |
- "[BUILD]/site_config/.amp_api_key", |
- "--api-secret-file", |
- "[BUILD]/site_config/.amp_api_secret", |
- "--api-address", |
- "172.22.21.180", |
- "--api-port", |
- "80", |
- "--api-protocol", |
- "http", |
- "--device-type", |
- "Android", |
- "--remote-device", |
- "Nexus 5", |
- "--remote-device-os", |
- "4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
- "--trigger", |
- "/path/to/tmp/json", |
+ "net_unittests", |
"--verbose", |
- "--release" |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] ui_touch_selection_unittests", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"device\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"brand\": \"Foo\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Fone\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os_version\": \"1.2.3\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "net_unittests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}}", |
- "[TMP_BASE]/amp_trigger_tmp_1/ui_touch_selection_unittests.json" |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "sandbox_linux_unittests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] save ui_touch_selection_unittests data" |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "sandbox_linux_unittests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "junit", |
+ "gtest", |
"-s", |
- "junit_unit_tests", |
+ "ui_base_unittests", |
"--verbose", |
- "--release" |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
- "name": "junit_unit_tests" |
+ "name": "ui_base_unittests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "python", |
+ "gtest", |
"-s", |
- "gyp_py_unittests", |
- "--verbose" |
+ "unit_tests", |
+ "--verbose", |
+ "--release", |
+ "--flakiness-dashboard-server=http://test-results.appspot.com", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
- "name": "gyp_py_unittests" |
+ "name": "unit_tests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "python", |
+ "junit", |
"-s", |
- "pylib_py_unittests", |
- "--verbose" |
+ "junit_unit_tests", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
- "name": "pylib_py_unittests" |
+ "name": "junit_unit_tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
+ ] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "junit", |
+ "-s", |
+ "chrome_junit_tests", |
+ "--verbose", |
+ "--release", |
+ "--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] load android_webview_unittests data", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "chrome_junit_tests", |
"~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"device\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"brand\": \"Foo\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Fone\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os_version\": \"1.2.3\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
@@ -964,41 +1335,21 @@ |
"python", |
"-u", |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
+ "junit", |
"-s", |
- "android_webview_unittests", |
- "--enable-platform-mode", |
- "-e", |
- "remote_device", |
- "--api-key-file", |
- "[BUILD]/site_config/.amp_api_key", |
- "--api-secret-file", |
- "[BUILD]/site_config/.amp_api_secret", |
- "--api-address", |
- "172.22.21.180", |
- "--api-port", |
- "80", |
- "--api-protocol", |
- "http", |
- "--device-type", |
- "Android", |
- "--remote-device", |
- "Nexus 5", |
- "--remote-device-os", |
- "4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
- "--collect", |
- "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json", |
- "--results-path", |
- "[TMP_BASE]/amp_results_tmp_2/android_webview_unittests/results.zip", |
+ "content_junit_tests", |
"--verbose", |
- "--release" |
+ "--release", |
+ "--json-results-file", |
+ "/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] android_webview_unittests", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "content_junit_tests", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@on Foo Fone 1.2.3@@@" |
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@" |
] |
}, |
{ |
@@ -1006,11 +1357,11 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json", |
+ "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] load base_unittests data", |
+ "name": "[collect] load android_webview_unittests data", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
@@ -1031,7 +1382,7 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "base_unittests", |
+ "android_webview_unittests", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -1051,17 +1402,15 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
- "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json", |
+ "[TMP_BASE]/amp_trigger_tmp_1/android_webview_unittests.json", |
"--results-path", |
- "[TMP_BASE]/amp_results_tmp_2/base_unittests/results.zip", |
+ "[TMP_BASE]/amp_results_tmp_2/android_webview_unittests/results.zip", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] base_unittests", |
+ "name": "[collect] android_webview_unittests", |
"~followup_annotations": [ |
"@@@STEP_TEXT@on Foo Fone 1.2.3@@@" |
] |
@@ -1071,11 +1420,11 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[TMP_BASE]/amp_trigger_tmp_1/cc_unittests.json", |
+ "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] load cc_unittests data", |
+ "name": "[collect] load base_unittests data", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
@@ -1096,7 +1445,7 @@ |
"[SLAVE_BUILD]/src/build/android/test_runner.py", |
"gtest", |
"-s", |
- "cc_unittests", |
+ "base_unittests", |
"--enable-platform-mode", |
"-e", |
"remote_device", |
@@ -1116,19 +1465,19 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
- "[TMP_BASE]/amp_trigger_tmp_1/cc_unittests.json", |
+ "[TMP_BASE]/amp_trigger_tmp_1/base_unittests.json", |
"--results-path", |
- "[TMP_BASE]/amp_results_tmp_2/cc_unittests/results.zip", |
+ "[TMP_BASE]/amp_results_tmp_2/base_unittests/results.zip", |
"--verbose", |
"--release" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[collect] cc_unittests", |
+ "name": "[collect] base_unittests", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@on Foo Fone 1.2.3@@@" |
+ "step returned non-zero exit code: 1", |
+ "@@@STEP_TEXT@on Foo Fone 1.2.3@@@", |
+ "@@@STEP_FAILURE@@@" |
] |
}, |
{ |
@@ -1181,8 +1530,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/components_unittests.json", |
"--results-path", |
@@ -1246,8 +1593,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/events_unittests.json", |
"--results-path", |
@@ -1311,8 +1656,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/gl_tests.json", |
"--results-path", |
@@ -1376,8 +1719,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/ipc_tests.json", |
"--results-path", |
@@ -1396,71 +1737,6 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[TMP_BASE]/amp_trigger_tmp_1/skia_unittests.json", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "[collect] load skia_unittests data", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"device\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"brand\": \"Foo\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Fone\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os_version\": \"1.2.3\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/src/build/android/test_runner.py", |
- "gtest", |
- "-s", |
- "skia_unittests", |
- "--enable-platform-mode", |
- "-e", |
- "remote_device", |
- "--api-key-file", |
- "[BUILD]/site_config/.amp_api_key", |
- "--api-secret-file", |
- "[BUILD]/site_config/.amp_api_secret", |
- "--api-address", |
- "172.22.21.180", |
- "--api-port", |
- "80", |
- "--api-protocol", |
- "http", |
- "--device-type", |
- "Android", |
- "--remote-device", |
- "Nexus 5", |
- "--remote-device-os", |
- "4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
- "--collect", |
- "[TMP_BASE]/amp_trigger_tmp_1/skia_unittests.json", |
- "--results-path", |
- "[TMP_BASE]/amp_results_tmp_2/skia_unittests/results.zip", |
- "--verbose", |
- "--release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "[collect] skia_unittests", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@on Foo Fone 1.2.3@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"[TMP_BASE]/amp_trigger_tmp_1/sql_unittests.json", |
"/path/to/tmp/json" |
], |
@@ -1506,8 +1782,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/sql_unittests.json", |
"--results-path", |
@@ -1571,8 +1845,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/sync_unit_tests.json", |
"--results-path", |
@@ -1636,8 +1908,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/ui_android_unittests.json", |
"--results-path", |
@@ -1701,8 +1971,6 @@ |
"Nexus 5", |
"--remote-device-os", |
"4.4.2", |
- "--remote-device-os", |
- "4.4.3", |
"--collect", |
"[TMP_BASE]/amp_trigger_tmp_1/ui_touch_selection_unittests.json", |
"--results-path", |
@@ -1720,6 +1988,46 @@ |
"cmd": [ |
"python", |
"-u", |
+ "[BUILD]/scripts/slave/tee.py", |
+ "[SLAVE_BUILD]/src/out/Release/full_log", |
+ "--", |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", |
+ "[SLAVE_BUILD]/src/out/logcat" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "logcat_dump" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack", |
+ "--arch", |
+ "arm", |
+ "--more-info", |
+ "[SLAVE_BUILD]/src/out/Release/full_log" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "stack_tool_with_logcat_dump" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/tombstones.py", |
+ "-a", |
+ "-s", |
+ "-w" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "env": { |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ }, |
+ "name": "stack_tool_for_tombstones" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n", |
"[SLAVE_BUILD]/src/out/Release/test_logs/*.log" |
], |
@@ -1735,5 +2043,10 @@ |
"@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", |
"@@@STEP_LOG_END@python.inline@@@" |
] |
+ }, |
+ { |
+ "name": "$final_result", |
+ "reason": "1 tests failed: ['base_unittests']", |
+ "status_code": 1 |
} |
] |