| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinAsan_dll__tester.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinAsan_dll__tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinAsan_dll__tester.json
|
| index b36f74b2d76f1a662d55c454ac99bcc0cbb6b3f3..c47611f65efb4eb25cb20bd74fb69e0a06762d5f 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinAsan_dll__tester.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinAsan_dll__tester.json
|
| @@ -5,6 +5,7 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -19,13 +20,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\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'}]",
|
| + "cache_dir = '[GIT_CACHE]'\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/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| - "[ROOT]\\b\\build\\slave\\cache_dir",
|
| + "[GIT_CACHE]",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -33,6 +34,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -108,9 +110,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -124,6 +127,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_DEFINES": "component=static_library target_arch=ia32 test_isolation_mode=prepare",
|
| @@ -135,17 +139,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"CrWinAsan(dll) tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -157,12 +162,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[CWD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"CrWinAsan(dll) tester\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -187,6 +193,7 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -194,8 +201,9 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[CWD]\\src\\out\\Release"
|
| + "[SLAVE_BUILD]\\src\\out\\Release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -225,6 +233,7 @@
|
| "--build-number",
|
| "571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| @@ -233,10 +242,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[CWD]\\src\\out\\Release",
|
| + "[SLAVE_BUILD]\\src\\out\\Release",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "find isolated tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -251,7 +261,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -310,6 +320,7 @@
|
| "--",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] browser_tests on Windows-7-SP1",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -335,9 +346,9 @@
|
| "python",
|
| "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]\\src\\tools\\swarming_client",
|
| + "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -350,6 +361,7 @@
|
| "1",
|
| "browser_tests/Windows-7-SP1/ffffffffff/CrWinAsan(dll) tester/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "browser_tests on Windows-7-SP1",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@shard #0 isolated out@blah@@@"
|
| @@ -375,6 +387,7 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [browser_tests on Windows-7-SP1]"
|
| },
|
| {
|
| @@ -385,6 +398,7 @@
|
| "--target",
|
| "Release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "process_dumps"
|
| },
|
| {
|
|
|