| Index: scripts/slave/recipes/chromium_trybot.expected/arm.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/arm.json b/scripts/slave/recipes/chromium_trybot.expected/arm.json
|
| index b7aecfbee23eef438cd8679eb3a3248d846c92fb..8ccfab8c8ef620f5e67873502960baca19007fb0 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/arm.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/arm.json
|
| @@ -12,8 +12,16 @@
|
| "TestSlavename",
|
| "--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'}]",
|
| + "--root",
|
| + "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| + "--issue",
|
| + "12853011",
|
| + "--patchset",
|
| + "1",
|
| + "--rietveld_server",
|
| + "https://codereview.chromium.org",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -127,68 +135,137 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "runhooks"
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "name": "read filter exclusion spec",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "diff",
|
| + "--cached",
|
| + "--name-only"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "name": "git diff to analyze patch",
|
| + "stdout": "/path/to/tmp/"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| + "--analyzer",
|
| + "{\"files\": [\"foo.cc\"], \"targets\": [\"browser_tests\", \"base_tests\", \"chrome\"]}",
|
| + "/path/to/tmp/json"
|
| ],
|
| "env": {
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "arm_float_abi=hard component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
|
| + "GYP_DEFINES": "arm_float_abi=hard component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm test_isolation_mode=archive use_goma=1"
|
| },
|
| - "name": "gclient runhooks (with patch)"
|
| + "name": "analyze",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@No compile necessary@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"No dependency\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"targets\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "--clean-isolated-files"
|
| + "[SLAVE_BUILD]/src/testing/scripts/checkdeps.py",
|
| + "--build-config-fs",
|
| + "Release",
|
| + "--paths",
|
| + "{\"build\": \"[BUILD]\"}",
|
| + "--properties",
|
| + "{\"buildername\": \"linux_arm\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
|
| + "run",
|
| + "--output",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "clean isolated files"
|
| + "name": "checkdeps (with patch)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| + "[SLAVE_BUILD]/src/tools/checkperms/checkperms.py",
|
| + "--root",
|
| "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--",
|
| - "all",
|
| - "base_tests",
|
| - "browser_tests",
|
| - "browser_tests_run",
|
| - "chrome"
|
| + "--json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "name": "checkperms (with patch)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/tools/checklicenses/checklicenses.py",
|
| + "--root",
|
| + "[SLAVE_BUILD]/src",
|
| + "--json",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "compile (with patch)"
|
| + "name": "checklicenses (with patch)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "--output-json",
|
| + "[SLAVE_BUILD]/src/testing/scripts/telemetry_unittests.py",
|
| + "--build-config-fs",
|
| + "Release",
|
| + "--paths",
|
| + "{\"build\": \"[BUILD]\"}",
|
| + "--properties",
|
| + "{\"buildername\": \"linux_arm\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
|
| + "run",
|
| + "--output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "find isolated tests",
|
| + "name": "telemetry_unittests (with patch)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| }
|
| ]
|
|
|