Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests_Trusty__dbg__1__32_.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests__dbg__1__32_.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests_Trusty__dbg__1__32_.json |
similarity index 89% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests__dbg__1__32_.json |
copy to scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests_Trusty__dbg__1__32_.json |
index ab59a3d4a0265c854d1510b9400ce4c6a80c95d0..4e017faeac3520be9aa9f284ab336d42fe80e7db 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests__dbg__1__32_.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Tests_Trusty__dbg__1__32_.json |
@@ -4,7 +4,7 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"511" |
], |
"name": "makedirs checkout path", |
@@ -40,7 +40,7 @@ |
"src@1111111", |
"--output_manifest" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"env": { |
"GCLIENT_KILL_GIT_FETCH_AFTER": "1200", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
@@ -183,7 +183,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/tools/swarming_client/swarming.py", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/tools/swarming_client/swarming.py", |
"--version" |
], |
"name": "swarming.py --version", |
@@ -199,7 +199,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
@@ -212,7 +212,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/testing/scripts/get_compile_targets.py", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
@@ -220,9 +220,9 @@ |
"Debug", |
"--use-src-side-runtest-py", |
"--paths", |
- "{\"checkout\": \"[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
+ "{\"checkout\": \"[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
- "{\"buildername\": \"Linux Tests (dbg)(1)(32)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
+ "{\"buildername\": \"Linux Tests Trusty (dbg)(1)(32)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
], |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
@@ -235,14 +235,14 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/testing/buildbot/chromium.linux.json", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/testing/buildbot/chromium.linux.json", |
"/path/to/tmp/json" |
], |
"name": "read test spec (chromium.linux.json)", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/testing/buildbot/chromium.linux.json@@@", |
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/testing/buildbot/chromium.linux.json@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"Linux Tests (dbg)(1)(32)\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Linux Tests Trusty (dbg)(1)(32)\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@", |
@@ -272,7 +272,7 @@ |
"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", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/out/Debug" |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/out/Debug" |
], |
"name": "rmtree build directory", |
"~followup_annotations": [ |
@@ -299,7 +299,7 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src", |
"--build-archive-url", |
"gs://test-domain/test-archive.zip", |
"--master-name", |
@@ -315,11 +315,11 @@ |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py", |
"--build-dir", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/out/Debug", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/out/Debug", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -337,7 +337,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/tools/swarming_client/swarming.py", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -348,7 +348,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests (dbg)(1)(32)/571", |
+ "browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests Trusty (dbg)(1)(32)/571", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -370,7 +370,7 @@ |
"pool", |
"Chrome", |
"--tag", |
- "buildername:Linux Tests (dbg)(1)(32)", |
+ "buildername:Linux Tests Trusty (dbg)(1)(32)", |
"--tag", |
"buildnumber:571", |
"--tag", |
@@ -396,16 +396,16 @@ |
"--", |
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
"name": "[trigger] browser_tests on Ubuntu-12.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests (dbg)(1)(32)/571\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests Trusty (dbg)(1)(32)/571\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests (dbg)(1)(32)/571\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests Trusty (dbg)(1)(32)/571\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
@@ -425,7 +425,7 @@ |
"python", |
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py", |
"--swarming-client-dir", |
- "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_/src/tools/swarming_client", |
+ "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_/src/tools/swarming_client", |
"--temp-root-dir", |
"[TMP_BASE]", |
"--merged-test-output", |
@@ -437,9 +437,9 @@ |
"--decorate", |
"--print-status-updates", |
"--json", |
- "{\"base_task_name\": \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests (dbg)(1)(32)/571\", \"tasks\": {\"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests (dbg)(1)(32)/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}" |
+ "{\"base_task_name\": \"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests Trusty (dbg)(1)(32)/571\", \"tasks\": {\"browser_tests/Ubuntu-12.04/ffffffffff/Linux Tests Trusty (dbg)(1)(32)/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -458,7 +458,7 @@ |
"--master-name", |
"chromium.linux", |
"--builder-name", |
- "Linux Tests (dbg)(1)(32)", |
+ "Linux Tests Trusty (dbg)(1)(32)", |
"--build-number", |
"571", |
"--test-type", |
@@ -468,7 +468,7 @@ |
"--chrome-revision", |
"170242" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_Tests__dbg__1__32_", |
+ "cwd": "[BUILDER_CACHE]/Linux_Tests_Trusty__dbg__1__32_", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |