| Index: scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic_build.json
|
| diff --git a/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic_build.json b/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic_build.json
|
| deleted file mode 100644
|
| index 94d94c976c9dd2ce2e8ef7da9ced0f1b1d911a08..0000000000000000000000000000000000000000
|
| --- a/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_Windows_Clang_deterministic_build.json
|
| +++ /dev/null
|
| @@ -1,339 +0,0 @@
|
| -[
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]\\scripts\\slave\\cleanup_temp.py"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup_temp"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]\\scripts\\slave\\bot_update.py",
|
| - "--master",
|
| - "chromium.swarm",
|
| - "--builder",
|
| - "Windows Clang deterministic build",
|
| - "--slave",
|
| - "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\"}",
|
| - "--output_json",
|
| - "/path/to/tmp/json",
|
| - "--revision",
|
| - "src@204787",
|
| - "--force"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "bot_update",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Some step text@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_cp\": \"refs/heads/master@{#124383}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision_cp@\"refs/heads/master@{#124383}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]\\gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "GYP_DEFINES": "clang=1 component=static_library dont_embed_build_metadata=1 fastbuild=1 target_arch=ia32 test_isolation_mode=prepare"
|
| - },
|
| - "name": "gclient runhooks"
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]\\scripts\\slave\\clang_revision.py",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "clang_revision",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| - "@@@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",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "clang",
|
| - "--clobber",
|
| - "--",
|
| - "chromium_swarm_tests"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "First build"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]\\resources\\remove_build_metadata.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]\\src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "remove_build_metadata",
|
| - "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_WARNINGS@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
|
| - "/path/to/tmp/",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\*.isolated.gen.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "find isolated targets"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]\\resources\\isolate.py",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| - "batcharchive",
|
| - "--dump-json",
|
| - "/path/to/tmp/json",
|
| - "--isolate-server",
|
| - "https://isolateserver.appspot.com",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\dummy_target_1.isolated.gen.json",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\dummy_target_2.isolated.gen.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "isolate tests",
|
| - "~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@}@@@",
|
| - "@@@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]\"}@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| - "[SLAVE_BUILD]\\src\\out\\Release.1"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Move [SLAVE_BUILD]\\src\\out\\Release to [SLAVE_BUILD]\\src\\out\\Release.1",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[2]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ shutil.rmtree(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.move(sys.argv[1], sys.argv[2])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]\\gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "GYP_DEFINES": "clang=1 component=static_library dont_embed_build_metadata=1 fastbuild=1 target_arch=ia32 test_isolation_mode=prepare"
|
| - },
|
| - "name": "gclient runhooks (2)"
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]\\scripts\\slave\\clang_revision.py",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "clang_revision (2)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| - "@@@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",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "clang",
|
| - "--clobber",
|
| - "--",
|
| - "chromium_swarm_tests"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Second build"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]\\resources\\remove_build_metadata.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]\\src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "remove_build_metadata (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
|
| - "/path/to/tmp/",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\*.isolated.gen.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "find isolated targets (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]\\resources\\isolate.py",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| - "batcharchive",
|
| - "--dump-json",
|
| - "/path/to/tmp/json",
|
| - "--isolate-server",
|
| - "https://isolateserver.appspot.com",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\dummy_target_1.isolated.gen.json",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\dummy_target_2.isolated.gen.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "isolate tests (2)",
|
| - "~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@}@@@",
|
| - "@@@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]\"}@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| - "[SLAVE_BUILD]\\src\\out\\Release.2"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Move [SLAVE_BUILD]\\src\\out\\Release to [SLAVE_BUILD]\\src\\out\\Release.2",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[2]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ shutil.rmtree(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.move(sys.argv[1], sys.argv[2])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]\\resources\\compare_build_artifacts.py",
|
| - "--first-build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release.1",
|
| - "--second-build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release.2",
|
| - "--target-platform",
|
| - "win"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "compare_build_artifacts"
|
| - }
|
| -]
|
|
|